diff --git a/.env.local.default b/.env.local.default index 9a93374bde..0c306931f7 100644 --- a/.env.local.default +++ b/.env.local.default @@ -16,7 +16,7 @@ KEY=certs/key.pem # Client variables --------------- APP_TITLE=Ethereal Engine -APP_LOGO=https://xrengine-static.s3-us-east-1.amazonaws.com/logo.png +APP_LOGO=https://etherealengine-static.s3-us-east-1.amazonaws.com/logo.png APP_URL=https://localhost:3000 APP_HOST=localhost:3000 APP_PORT=3000 @@ -51,14 +51,14 @@ VITE_8TH_WALL= # DB variables ------------------- MYSQL_USER=server MYSQL_PASSWORD=password -MYSQL_DATABASE=xrengine +MYSQL_DATABASE=etherealengine MYSQL_HOST=127.0.0.1 MYSQL_PORT=3306 MYSQL_URL= MYSQL_TEST_USER=server MYSQL_TEST_PASSWORD=password -MYSQL_TEST_DATABASE=xrengine +MYSQL_TEST_DATABASE=etherealengine MYSQL_TEST_HOST=127.0.0.1 MYSQL_TEST_PORT=3305 MYSQL_TEST_URL= @@ -81,7 +81,7 @@ STORAGE_PROVIDER=local LOCAL_STORAGE_PROVIDER=localhost:8642 LOCAL_STORAGE_PROVIDER_PORT=8642 GOOGLE_ANALYTICS_TRACKING_ID= -HUB_ENDPOINT=https://xrengine.io +HUB_ENDPOINT=https://etherealengine.io INSTANCESERVER_UNREACHABLE_TIMEOUT_SECONDS=10 @@ -102,7 +102,7 @@ KUBERNETES_PORT_443_TCP_PORT= # -------------------------------- # Game server variables ---------- -INSTANCESERVER_DOMAIN=00000.instanceserver-test.xrengine.io +INSTANCESERVER_DOMAIN=00000.instanceserver-test.etherealengine.io RTC_START_PORT=40000 RTC_END_PORT=49999 RTC_PORT_BLOCK_SIZE=50 @@ -161,13 +161,13 @@ AWS_SMS_APPLICATION_ID= AWS_SMS_SENDER_ID= # - Cloud front -STORAGE_CLOUDFRONT_DOMAIN=resources.xrengine.io +STORAGE_CLOUDFRONT_DOMAIN=resources.etherealengine.io STORAGE_CLOUDFRONT_DISTRIBUTION_ID=E3E9EQTR0OYMND STORAGE_CLOUDFRONT_REGION=us-west-1 # - S3 STORAGE_S3_REGION=us-west-1 -STORAGE_S3_STATIC_RESOURCE_BUCKET=xrengine-static-resources +STORAGE_S3_STATIC_RESOURCE_BUCKET=etherealengine-static-resources STORAGE_S3_AVATAR_DIRECTORY=avatars # Possible values: @@ -188,7 +188,7 @@ STORAGE_AWS_ACCESS_KEY_SECRET= # Chargebee variables ------------ -CHARGEBEE_SITE=xrengine-test +CHARGEBEE_SITE=etherealengine-test CHARGEBEE_API_KEY= # -------------------------------- @@ -217,7 +217,7 @@ BLOCKCHAIN_URL_SECRET=secret # IPFS USE_IPFS= -FRONTEND_SERVICE_URL=https://local-matchmaking.xrengine.io/v1/frontendservice +FRONTEND_SERVICE_URL=https://local-matchmaking.etherealengine.io/v1/frontendservice #define logging url ELASTIC_HOST=http://localhost:9200 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 6aa2799351..600df28a5c 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: # [xrfoundation] +github: # [etherealengine] patreon: # Replace with a single Patreon username open_collective: etherealengine ko_fi: # Replace with a single Ko-fi username diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 53dc399005..6b97e98a45 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -9,12 +9,12 @@ body: - type: markdown attributes: value: | - Thanks for using XREngine! Let's figure out the problem. + Thanks for using Ethereal Engine! Let's figure out the problem. - type: input id: os attributes: label: Operating System - description: What operating system is XREngine running on? + description: What operating system is Ethereal Engine running on? validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/tech_support.md b/.github/ISSUE_TEMPLATE/tech_support.md index 7bb0cc55bc..c87a2d3a2d 100644 --- a/.github/ISSUE_TEMPLATE/tech_support.md +++ b/.github/ISSUE_TEMPLATE/tech_support.md @@ -1,6 +1,6 @@ --- name: Installation Tech Support -about: I'm having difficulty installing XREngine +about: I'm having difficulty installing Ethereal Engine title: '[Ticket]: ' labels: '[ticket]' assignees: '' @@ -9,7 +9,7 @@ body: - type: markdown attributes: value: | - Thanks for using XREngine! Let's figure out the problem. + Thanks for using Ethereal Engine! Let's figure out the problem. - type: input id: os attributes: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c07feb4464..ebfebd74d8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -11,7 +11,7 @@ closes #_insert number here_ ## Checklist - [ ] If this PR is still a WIP, convert to a draft - [ ] When this PR is ready, mark it as "Ready for review" -- [ ] [ensure all checks pass](https://github.com/XRFoundation/XREngine/wiki/Testing-&-Contributing) +- [ ] [ensure all checks pass](https://github.com/etherealengine/etherealengine/wiki/Testing-&-Contributing) - [ ] Changes have been manually QA'd - [ ] Changes reviewed by at least 2 approved reviewer diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 9ffb8656fb..d28475c971 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -1,4 +1,4 @@ -![xrengine](https://github.com/XRFoundation/XREngine/raw/dev/xrengine%20black.png) +![Ethereal Engine](https://github.com/etherealengine/etherealengine/raw/dev/etherealengine%20black.png) # Github Actions @@ -26,8 +26,8 @@ This action builds the codebase builder Docker image, pushes that to a specified deploys it to a dev Kubernetes cluster using kubectl and Helm. It assumes that `dev` is the main branch and that anything pushed to `dev` should be deployed to a dev deployment. In particular, this action: -* Installs kubectl and Helm via a Snapcraft Snap, then downloads the XREngine Helm repo -* Builds the XREngine Builder Docker image +* Installs kubectl and Helm via a Snapcraft Snap, then downloads the Ethereal Engine Helm repo +* Builds the Ethereal Engine Builder Docker image * Installs aws-sdk * Pushes the Builder image to the dev-builder repo in ECR * Uses Helm to upgrade the dev builder deployment with the dev-builder image @@ -37,7 +37,7 @@ There are two secrets controlling this action: *`SEND_FINISHED_WEBHOOK` - setting it to true will enable sending a webhook notification if everything is successful; if `DEPLOYMENTS_ENABLED` is not true, this step will never be reached -As of this writing, deployment of XREngine is only officially supported on AWS' EKS. As a result, several +As of this writing, deployment of Ethereal Engine is only officially supported on AWS' EKS. As a result, several variables and scripts deal with AWS SDKs. If you want to deploy to GKE or another cloud provider, you'll have to modify some of these variables, downloads, and calls to use another service. @@ -49,11 +49,11 @@ This action uses several other secrets to control what repo it is interacting wi *`DOCKER_LABEL`: In the builder service, this is the name of a Docker Hub repo that the final image will be published to. Everywhere else, it's just a default label for the Docker images as they're built. Must be set, but can be anything as long as you're not planning to publish to Docker Hub. -*`DEV_REPO_NAME`: The name of the repo that this built image will be deployed to; most easily set to `xrengine-dev-builder` -(also have a repo `xrengine-dev` for the final built image) +*`DEV_REPO_NAME`: The name of the repo that this built image will be deployed to; most easily set to `etherealengine-dev-builder` +(also have a repo `etherealengine-dev` for the final built image) *`ECR_URL`: The URL of the ECR registry that this built image will be pushed to. Do *not* include the repo name; -if you are pushing the image to `12345.dkr.ecr.us-west-1.amazonaws.com/xrengine-dev-builder`, then `ECR_URL` -should be `12345.dkr.ecr.us-west-1.amazonaws.com` and `REPO_NAME` should be `xrengine-dev-builder`. +if you are pushing the image to `12345.dkr.ecr.us-west-1.amazonaws.com/etherealengine-dev-builder`, then `ECR_URL` +should be `12345.dkr.ecr.us-west-1.amazonaws.com` and `REPO_NAME` should be `etherealengine-dev-builder`. *`PRIVATE_ECR`: Set to `true` if the ECR registry you're pushing to is private, otherwise don't set this or set it to anything else other than `true` *`WEBHOOK_URL`: The URL of the webhook that should be called when the action finishes (no need to set @@ -72,8 +72,8 @@ deploys it to a prod Kubernetes cluster using kubectl and Helm. It assumes that production-ready branch and that anything pushed to `prod` should be deployed to a prod deployment. In particular, this action: -* Installs kubectl and Helm via a Snapcraft Snap, then downloads the XREngine Helm repo -* Builds the XREngine Builder Docker image +* Installs kubectl and Helm via a Snapcraft Snap, then downloads the Ethereal Engine Helm repo +* Builds the Ethereal Engine Builder Docker image * Installs aws-sdk * Pushes the Builder image to the prod-builder repo in ECR * Uses Helm to upgrade the prod builder deployment with the prod-builder image @@ -83,7 +83,7 @@ There are two secrets controlling this action: *`SEND_FINISHED_WEBHOOK` - setting it to true will enable sending a webhook notification if everything is successful; if `DEPLOYMENTS_ENABLED` is not true, this step will never be reached -As of this writing, deployment of XREngine is only officially supported on AWS' EKS. As a result, several +As of this writing, deployment of Ethereal Engine is only officially supported on AWS' EKS. As a result, several variables and scripts deal with AWS SDKs. If you want to deploy to GKE or another cloud provider, you'll have to modify some of these variables, downloads, and calls to use another service. @@ -95,11 +95,11 @@ This action uses several other secrets to control what repo it is interacting wi *`DOCKER_LABEL`: In the builder service, this is the name of a Docker Hub repo that the final image will be published to. Everywhere else, it's just a default label for the Docker images as they're built. Must be set, but can be anything as long as you're not planning to publish to Docker Hub. -*`PROD_REPO_NAME`: The name of the repo that this built image will be deployed to; most easily set to `xrengine-prod-builder` -(also have a repo `xrengine-prod` for the final built image) +*`PROD_REPO_NAME`: The name of the repo that this built image will be deployed to; most easily set to `etherealengine-prod-builder` +(also have a repo `etherealengine-prod` for the final built image) *`ECR_URL`: The URL of the ECR registry that this built image will be pushed to. Do *not* include the repo name; -if you are pushing the image to `12345.dkr.ecr.us-west-1.amazonaws.com/xrengine-prod-builder`, then `ECR_URL` -should be `12345.dkr.ecr.us-west-1.amazonaws.com` and `REPO_NAME` should be `xrengine-prod-builder`. +if you are pushing the image to `12345.dkr.ecr.us-west-1.amazonaws.com/etherealengine-prod-builder`, then `ECR_URL` +should be `12345.dkr.ecr.us-west-1.amazonaws.com` and `REPO_NAME` should be `etherealengine-prod-builder`. *`PRIVATE_ECR`: Set to `true` if the ECR registry you're pushing to is private, otherwise don't set this or set it to anything else other than `true` *`WEBHOOK_URL`: The URL of the webhook that should be called when the action finishes (no need to set @@ -131,7 +131,7 @@ There is one secret controlling this action: *`PUBLISH_NPM_PACKAGES_ENABLED` - setting it to true will enable the action ##update-deps-branch.yml -Most of XREngine's dependencies are version-locked in the respective package.jsons, and the main repo has +Most of Ethereal Engine's dependencies are version-locked in the respective package.jsons, and the main repo has renovate make PRs when new versions of dependencies have been published. To prevent a constant stream of minor version bumps interrupting build caches, the main repo has renovate automatically merge these updates to the branch `deps`, and at a later date many of these updates can be reviewed and merged in in one go. diff --git a/.github/workflows/branch-build.yml b/.github/workflows/branch-build.yml index 3c913e1fac..67cefb5b22 100755 --- a/.github/workflows/branch-build.yml +++ b/.github/workflows/branch-build.yml @@ -37,6 +37,10 @@ jobs: package-lock.json key: ${{ runner.os }}-branch-build-${{ hashFiles('**/package.json') }} - run: cp .env.local.default .env.local + - name: Config npm registry token + run: npm config set '//npm.pkg.github.com/:_authToken' "${NPM_TOKEN}" + env: + NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm install --production=false --loglevel notice --legacy-peer-deps - run: npm run lint - run: npm run check-errors diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b72bd4415e..3c8c7eef1f 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -31,7 +31,7 @@ jobs: NODE_OPTIONS: --max_old_space_size=8192 run: | npm install --legacy-peer-deps - git clone https://github.com/XRFoundation/ethereal-engine-docs.git docs + git clone https://github.com/etherealengine/etherealengine-docs.git docs cd docs npm install --legacy-peer-deps npm run build @@ -58,7 +58,7 @@ jobs: git config --global user.email "actions@github.com" git config --global user.name "gh-actions" npm install --legacy-peer-deps - git clone https://github.com/XRFoundation/ethereal-engine-docs.git docs + git clone https://github.com/etherealengine/etherealengine-docs.git docs cd docs npm install --legacy-peer-deps npm run deploy diff --git a/.github/workflows/projects-build.yml b/.github/workflows/projects-build.yml index d99264c44b..5b4ebab083 100755 --- a/.github/workflows/projects-build.yml +++ b/.github/workflows/projects-build.yml @@ -21,18 +21,13 @@ jobs: if: ${{ needs.secrets-gate.outputs.ok == 'enabled' }} runs-on: ubuntu-latest steps: - - name: Checkout XREngine + - name: Checkout Ethereal Engine uses: actions/checkout@v3 - - name: Checkout XREngine-Project-eCommerce Project + - name: Checkout ee-development-test-suite uses: actions/checkout@v3 with: - repository: XRFoundation/XREngine-Project-eCommerce - path: './packages/projects/projects/XREngine-Project-eCommerce' - - name: Checkout XREngine-Project-Demo Project - uses: actions/checkout@v3 - with: - repository: XRFoundation/XREngine-Project-Demo - path: './packages/projects/projects/XREngine-Project-Demo' + repository: etherealengine/ee-development-test-suite + path: './packages/projects/projects/ee-development-test-suite' - name: Use Node.js uses: actions/setup-node@v3 with: diff --git a/.github/workflows/publish-npm-packages.yml b/.github/workflows/publish-npm-packages.yml index 067cd0ae44..1553d95fdc 100644 --- a/.github/workflows/publish-npm-packages.yml +++ b/.github/workflows/publish-npm-packages.yml @@ -27,7 +27,7 @@ jobs: with: node-version: 18.x registry-url: https://npm.pkg.github.com/ - scope: '@XRFoundation' + scope: '@etherealengine' - name: Config npm registry token run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}" env: @@ -35,7 +35,7 @@ jobs: - name: Set git username run: git config user.name "CI Bot" - name: Set git email - run: git config user.email ci-bot@xrengine.io + run: git config user.email ci-bot@etherealengine.org - name: Set pr_branch_name environment variable run: echo pr_branch_name=version-increment-${{ github.event.release.tag_name }} >> $GITHUB_ENV - name: Switch to branch ${{ env.pr_branch_name }} @@ -71,8 +71,6 @@ jobs: run: npm run publish-no-verify env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Update package repo to GitHub Packages - run: npm run update-name-gh-package - name: Run git add run: git add . - name: Commit changes diff --git a/.gitignore b/.gitignore index a00f272d7f..a6469650b1 100755 --- a/.gitignore +++ b/.gitignore @@ -127,8 +127,8 @@ dist # TernJS port file .tern-port -**/xrengine-secrets.env -**/xrengine-dev-secrets.env +**/etherealengine-secrets.env +**/etherealengine-dev-secrets.env lib/ bin/ diff --git a/.npmrc b/.npmrc index ef47b9e4ae..c2ddff8217 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ legacy-peer-deps=true -@XRFoundation:registry=https://npm.pkg.github.com +@etherealengine:registry=https://npm.pkg.github.com shamefully-hoist=true \ No newline at end of file diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs index 5c2e3e49c7..0aa1922f2b 100644 --- a/.pnpmfile.cjs +++ b/.pnpmfile.cjs @@ -4,7 +4,7 @@ function readPackage(pkg) { const externalDeps = {}; Object.entries(pkg.peerDependencies).forEach(([key, value]) => { - if(key.startsWith('@xrengine')){ + if(key.startsWith('@etherealengine')){ internalDeps[key] = value; }else{ externalDeps[key] = value; diff --git a/.prettierrc.json b/.prettierrc.json index 970be2455c..52da598110 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -12,7 +12,7 @@ "arrowParens": "always", "proseWrap": "never", "endOfLine": "lf", - "importOrder": ["", "^@xrengine/(.*)$", "^@mui/(.*)$", "^[./]"], + "importOrder": ["", "^@etherealengine/(.*)$", "^@mui/(.*)$", "^[./]"], "importOrderSeparation": true, "importOrderSortSpecifiers": true, "importOrderCaseInsensitive": true diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 4d52dbe6aa..8abdd2584d 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,7 +60,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -hello@xrengine.io. +hello@etherealengine.org. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 31424879ba..963e5174fe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ We have strict formatting rules for all `.ts` and `.tsx` files. Please use the ` Develop on your own branch and submit PRs for review. -If you are part of the XREngine development team, please create branches on ths repository, otherwise create a fork and branches to PR. +If you are part of the Ethereal Engine development team, please create branches on ths repository, otherwise create a fork and branches to PR. Ensure any extraneous local project files, installs or build dependencies are removed before making a PR. You may make a seperate PR for adding to the .gitignore. diff --git a/LICENSE b/LICENSE index d87b114c53..5f9463deea 100755 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the Ethereal Engine team, formally XREngine by XR Foundation codebase are derived from other projects. -All original work by the Ethereal Engine team, formally XREngine by XR Foundation team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the Ethereal Engine team, formally XREngine by XR Foundatio MIT License -Copyright (c) 2020-2022 Ethereal Engine team, formally XREngine by XR Foundation +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a36b38f88f..c82cca8228 100755 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ - [Contributing](#contributing) - [Let's build it together](#lets-build-it-together) - [License](#license) -- [Releases](https://github.com/XRFoundation/XREngine/releases) +- [Releases](https://github.com/etherealengine/etherealengine/releases) - [Roadmap](/ROADMAP.md) ## Background https://user-images.githubusercontent.com/507127/142818955-51d7757f-a432-45da-8f8f-56037358ad58.mp4 -We ([Ethereal Engine](https://github.com/xrfoundation)) believe that the Metaverse, +We ([Ethereal Engine](https://github.com/etherealengine)) believe that the Metaverse, Web AR, VR, and XR should be easy. We want a Star Trek future where participating in immersive communication @@ -59,11 +59,11 @@ Host Demos ## XRModule -### [Library of XRModules](https://github.com/XRFoundation?q=xre-project) +### [Library of XRModules](https://github.com/etherealengine?q=project) Create composable plug-ins for Ethereal Engine scenes with XRModule Projects -### [Create XRModule Projects](https://xrfoundation.github.io/ethereal-engine-docs/docs/concepts/projects_api) +### [Create XRModule Projects](https://etherealengine.github.io/etherealengine-docs/docs/concepts/projects_api) XRModules are folders that contain all your custom code, assets and scenes. They are version controlled using git & github, and can be installed to any deployment with a single click. (more on that in the next chapter) @@ -73,7 +73,7 @@ In a production environment, the builder process will install all projects accor ## Launch Ethereal Engine with Control Center Install - ***RECOMMENDED*** -### [Use Metaverse Control Plane Managment GUI](https://github.com/XRFoundation/XREngine-Control-Center) +### [Use Metaverse Control Plane Managment GUI](https://github.com/etherealengine/etherealengine-Control-Center) Best for simple self hosting, advanced editor content creation, and XRProject Pack Project development. @@ -99,24 +99,24 @@ To install Ethereal Engine locally, the following pre-reqs are required. ### Getting Started -See the [Installation instructions](https://xrfoundation.github.io/ethereal-engine-docs/docs/installation/) +See the [Installation instructions](https://etherealengine.github.io/etherealengine-docs/docs/installation/) for more details. ## Usage ### Documentation -* [General Ethereal Engine documentation](https://xrfoundation.github.io/ethereal-engine-docs/docs) -* [Auto-generated (tsdoc) API reference](https://xrfoundation.github.io/ethereal-engine-docs/docs/generated/common/) -* [Avatar, Scene & Asset Pipeline](https://github.com/XRFoundation/XREngine/wiki/Avatar,-Scene-&-Asset-Pipeline) -* [Why are we building Ethereal Engine?](https://xrfoundation.github.io/ethereal-engine-docs/docs/) +* [General Ethereal Engine documentation](https://etherealengine.github.io/etherealengine-docs/docs) +* [Auto-generated (tsdoc) API reference](https://etherealengine.github.io/etherealengine-docs/docs/generated/common/) +* [Avatar, Scene & Asset Pipeline](https://github.com/etherealengine/etherealengine/wiki/Avatar,-Scene-&-Asset-Pipeline) +* [Why are we building Ethereal Engine?](https://etherealengine.github.io/etherealengine-docs/docs/) ## Contributing * We expect contributors and community members to follow our [Code of Conduct](CODE_OF_CONDUCT.md). * See the **[Contributing Guide](CONTRIBUTING.md)** and corresponding - [wiki entry](https://github.com/XRFoundation/XREngine/wiki/Contributing) + [wiki entry](https://github.com/etherealengine/etherealengine/wiki/Contributing) for more details. * Version numbering of the Ethereal Engine monorepo follows the [Semantic versioning](http://semver.org/) approach. diff --git a/README_tofix.md b/README_tofix.md index f20b7e32e4..ed71a2d899 100644 --- a/README_tofix.md +++ b/README_tofix.md @@ -1,6 +1,6 @@ We want to add these badges, but there are some issues making that happen. Let's leave these here until they are all fixed and we can recommend them. -### **Build Status : Beta -** ![branch-build](https://github.com/xrfoundation/xrengine/actions/workflows/branch-build.yml/badge.svg) **- Release -** ![prod-deploy](https://github.com/xrfoundation/xrengine/actions/workflows/.github/workflows/prod-deploy.yml/badge.svg) -### Releases : ![release-packages](https://github.com/xrfoundation/xrengine/actions/workflows/.github/workflows/release-packages.yml/badge.svg) ![publish-container](https://github.com/xrfoundation/xrengine/actions/workflows/publish-gh-container.yml/badge.svg) ![publish-npm-packages](https://github.com/xrfoundation/xrengine/actions/workflows/publish-npm-packages.yml/badge.svg) ![documentation](https://github.com/xrfoundation/xrengine/actions/workflows/documentation.yml/badge.svg) +### **Build Status : Beta -** ![branch-build](https://github.com/etherealengine/etherealengine/actions/workflows/branch-build.yml/badge.svg) **- Release -** ![prod-deploy](https://github.com/etherealengine/etherealengine/actions/workflows/.github/workflows/prod-deploy.yml/badge.svg) +### Releases : ![release-packages](https://github.com/etherealengine/etherealengine/actions/workflows/.github/workflows/release-packages.yml/badge.svg) ![publish-container](https://github.com/etherealengine/etherealengine/actions/workflows/publish-gh-container.yml/badge.svg) ![publish-npm-packages](https://github.com/etherealengine/etherealengine/actions/workflows/publish-npm-packages.yml/badge.svg) ![documentation](https://github.com/etherealengine/etherealengine/actions/workflows/documentation.yml/badge.svg) -## [Link to Full Documentation](https://xrfoundation.github.io/ethereal-engine-docs/docs/) +## [Link to Full Documentation](https://etherealengine.github.io/etherealengine-docs/docs/) diff --git a/ROADMAP.md b/ROADMAP.md index 2641a0fe4f..3ff9619cfc 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,10 +1,10 @@ -# XRFoundation Ecosystem Roadmap +# Ethereal Engine Ecosystem Roadmap ## 2022 Q2 -- [x] XREngine Cluster Control Center +- [x] Ethereal Engine Cluster Control Center - [x] Coil Integration - [x] Inverse Kinematics - [x] Light & Dark Mode diff --git a/npx/cli.js b/npx/cli.js index 7eee0dd6ac..5c08f972c4 100755 --- a/npx/cli.js +++ b/npx/cli.js @@ -17,7 +17,7 @@ const runCommand = (command) => { // Checkout repo console.log(`Cloning as ${repoName}...`); -const gitCheckoutCommand = `git clone --depth 1 https://github.com/XRFoundation/XREngine ${repoName}`; +const gitCheckoutCommand = `git clone --depth 1 https://github.com/etherealengine/etherealengine ${repoName}`; const checkedOut = runCommand(gitCheckoutCommand); if (!checkedOut) process.exitCode = -1; diff --git a/package.json b/package.json index e43563c500..e4127792b3 100755 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { - "name": "xrengine", - "description": "Game Engine, Server & Devops powering The XREngine. Please support XRFoundation https://opencollective.com/xrfoundation", + "name": "etherealengine", + "description": "Engine, Server & Devops powering Ethereal Engine. Please support at https://opencollective.com/etherealengine", "version": "0.0.0", - "homepage": "xrengine.io", + "homepage": "etherealengine.org", "private": true, "bin": { - "xrengine": "npx/cli.js" + "etherealengine": "npx/cli.js" }, "workspaces": [ "packages/*", @@ -24,8 +24,8 @@ "vr" ], "author": { - "name": "XR Engine - XR Foundation", - "email": "info@xrengine.io" + "name": "Ethereal Engine", + "email": "info@etherealengine.org" }, "entrypoint": {}, "contributors": [], @@ -55,7 +55,7 @@ "dev-taskserver": "cd packages/taskserver && npm run dev", "dev-docker": "cd scripts && docker-compose up -d", "dev-tabs": "cd scripts && ./dev-tabs.sh", - "fetch-projects": "lerna exec 'git fetch -p && git rebase' --parallel --ignore @xrengine/*", + "fetch-projects": "lerna exec 'git fetch -p && git rebase' --parallel --ignore @etherealengine/*", "dev-nginx": "", "dev-reinit": "npm run dev-docker && cd packages/server && npm run dev-reinit-db", "dev-server": "cd packages/server && npm run dev", @@ -86,7 +86,6 @@ "test-e2e": "ts-node --swc scripts/run_e2e_tests.ts", "test:projects": "cross-env TEST=true lerna run test:projects", "test:ci": "cpy --no-overwrite --rename=.env.local '.env.local.default' . && cross-env CI=true npm run test", - "update-name-gh-package": "lerna run update-name-gh-package", "validate": "npm run lint && lerna run validate", "version-increment": "lerna version --conventional-commits --yes", "version-increment-no-tag": "lerna version --conventional-commits --yes --no-git-tag-version", diff --git a/packages/client-core/.ctirc b/packages/client-core/.ctirc deleted file mode 100644 index d78b605933..0000000000 --- a/packages/client-core/.ctirc +++ /dev/null @@ -1,36 +0,0 @@ -{ - addNewline: true, - excludes: [ - '@types', - 'typings', - '__test__', - '__tests__', - 'node_modules', - ], - fileExcludePatterns: [], - fileFirst: true, - globOptions: { - cwd: 'D:\\Projects\\xr3ngine\\packages\\engine', - dot: true, - ignore: [ - '@types/**', - 'typings/**', - '__test__/**', - '__tests__/**', - 'node_modules/**', - ], - nonull: true, - }, - includeCWD: true, - output: 'index.ts', - quote: "'", - targetExts: [ - 'ts', - 'tsx', - ], - useSemicolon: false, - useTimestamp: false, - verbose: false, - withoutBackupFile: true, - withoutComment: true, -} diff --git a/packages/client-core/i18n/en/admin.json b/packages/client-core/i18n/en/admin.json index f87440dd2f..3f478cfe90 100755 --- a/packages/client-core/i18n/en/admin.json +++ b/packages/client-core/i18n/en/admin.json @@ -44,7 +44,7 @@ "spawnBot": "Spawn Bot", "lastRunStatus": "Last run status", "autoRefreshing": "auto refreshing in 10s", - "xrEngineBots": "XREngine bots", + "engineBots": "Ethereal Engine bots", "updateBot": "UPDATE BOT", "name": "Name", "confirmBotDelete": "Do you want to delete bot" diff --git a/packages/client-core/package.json b/packages/client-core/package.json index f34172f0fa..ab263c57a9 100755 --- a/packages/client-core/package.json +++ b/packages/client-core/package.json @@ -1,9 +1,9 @@ { - "name": "@xrengine/client-core", + "name": "@etherealengine/client-core", "version": "1.1.3", "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "engines": { "node": ">= 18.12.0" @@ -17,8 +17,7 @@ "npmClient": "npm", "scripts": { "check-errors": "tsc --noemit", - "test": "mocha --config .mocharc.js", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "test": "mocha --config .mocharc.js" }, "resolutions": { "@types/react": "18.0.19", @@ -42,9 +41,9 @@ "@mui/material": "5.11.0", "@mui/styled-engine-sc": "5.11.0", "@mui/x-date-pickers": "5.0.0-beta.4", - "@xrengine/common": "^1.1.3", - "@xrengine/engine": "^1.1.3", - "@xrengine/hyperflux": "^1.1.3", + "@etherealengine/common": "^1.1.3", + "@etherealengine/engine": "^1.1.3", + "@etherealengine/hyperflux": "^1.1.3", "apexcharts": "^3.28.3", "axios": "0.26.1", "classnames": "2.3.1", diff --git a/packages/client-core/scripts/update-name-gh-package.js b/packages/client-core/scripts/update-name-gh-package.js deleted file mode 100644 index d89dcec8f2..0000000000 --- a/packages/client-core/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/client-core'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/client-core/src/API.ts b/packages/client-core/src/API.ts index 6593330eae..06cb87769e 100755 --- a/packages/client-core/src/API.ts +++ b/packages/client-core/src/API.ts @@ -4,8 +4,8 @@ import feathers from '@feathersjs/client' import type { FeathersApplication } from '@feathersjs/feathers' import Primus from 'primus-client' -import type { ServiceTypes } from '@xrengine/common/declarations' -import config from '@xrengine/common/src/config' +import type { ServiceTypes } from '@etherealengine/common/declarations' +import config from '@etherealengine/common/src/config' import primusClient from './util/primus-client' diff --git a/packages/client-core/src/admin/adminRoutes.tsx b/packages/client-core/src/admin/adminRoutes.tsx index b635e42851..a6d4fd92fe 100644 --- a/packages/client-core/src/admin/adminRoutes.tsx +++ b/packages/client-core/src/admin/adminRoutes.tsx @@ -2,18 +2,18 @@ import { t } from 'i18next' import React, { lazy, Suspense, useEffect } from 'react' import { Navigate, Route, Routes } from 'react-router-dom' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { initSystems } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { dispatchAction } from '@xrengine/hyperflux' -import Dashboard from '@xrengine/ui/src/Dashboard' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { initSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { dispatchAction } from '@etherealengine/hyperflux' +import Dashboard from '@etherealengine/ui/src/Dashboard' import { LoadingCircle } from '../components/LoadingCircle' import AdminSystem from '../systems/AdminSystem' import { useAuthState } from '../user/services/AuthService' import Analytics from './components/Analytics' -const $allowed = lazy(() => import('@xrengine/client-core/src/admin/allowedRoutes')) +const $allowed = lazy(() => import('@etherealengine/client-core/src/admin/allowedRoutes')) const AdminSystemInjection = { uuid: 'core.admin.AdminSystem', diff --git a/packages/client-core/src/admin/common/AddCommand.tsx b/packages/client-core/src/admin/common/AddCommand.tsx index 38a6c52a3f..09502ea3e5 100644 --- a/packages/client-core/src/admin/common/AddCommand.tsx +++ b/packages/client-core/src/admin/common/AddCommand.tsx @@ -1,16 +1,16 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { BotCommands } from '@xrengine/common/src/interfaces/AdminBot' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import List from '@xrengine/ui/src/List' -import ListItem from '@xrengine/ui/src/ListItem' -import ListItemSecondaryAction from '@xrengine/ui/src/ListItemSecondaryAction' -import ListItemText from '@xrengine/ui/src/ListItemText' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { BotCommands } from '@etherealengine/common/src/interfaces/AdminBot' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import List from '@etherealengine/ui/src/List' +import ListItem from '@etherealengine/ui/src/ListItem' +import ListItemSecondaryAction from '@etherealengine/ui/src/ListItemSecondaryAction' +import ListItemText from '@etherealengine/ui/src/ListItemText' import styles from '../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/common/Search.tsx b/packages/client-core/src/admin/common/Search.tsx index cc04e2807b..3decfee8b0 100644 --- a/packages/client-core/src/admin/common/Search.tsx +++ b/packages/client-core/src/admin/common/Search.tsx @@ -1,9 +1,9 @@ import React from 'react' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import InputBase from '@xrengine/ui/src/InputBase' -import Paper from '@xrengine/ui/src/Paper' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import InputBase from '@etherealengine/ui/src/InputBase' +import Paper from '@etherealengine/ui/src/Paper' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/admin/common/SketchColorPicker.tsx b/packages/client-core/src/admin/common/SketchColorPicker.tsx index 468e17483f..774ca522b8 100644 --- a/packages/client-core/src/admin/common/SketchColorPicker.tsx +++ b/packages/client-core/src/admin/common/SketchColorPicker.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useState } from 'react' import { SketchPicker } from 'react-color' -import Button from '@xrengine/ui/src/Button' -import Popover from '@xrengine/ui/src/Popover' +import Button from '@etherealengine/ui/src/Button' +import Popover from '@etherealengine/ui/src/Popover' interface SketchColorPickerProps { name: string diff --git a/packages/client-core/src/admin/common/SubmitDialog.tsx b/packages/client-core/src/admin/common/SubmitDialog.tsx index d6a803f75e..c9cfd04639 100644 --- a/packages/client-core/src/admin/common/SubmitDialog.tsx +++ b/packages/client-core/src/admin/common/SubmitDialog.tsx @@ -1,14 +1,14 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Dialog from '@xrengine/ui/src/Dialog' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogContent from '@xrengine/ui/src/DialogContent' -import DialogContentText from '@xrengine/ui/src/DialogContentText' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import TextField from '@xrengine/ui/src/TextField' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Dialog from '@etherealengine/ui/src/Dialog' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogContent from '@etherealengine/ui/src/DialogContent' +import DialogContentText from '@etherealengine/ui/src/DialogContentText' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import TextField from '@etherealengine/ui/src/TextField' import ProfileMenu from '../../user/components/UserMenu/menus/ProfileMenu' import SettingMenu from '../../user/components/UserMenu/menus/SettingMenu' diff --git a/packages/client-core/src/admin/common/Table.tsx b/packages/client-core/src/admin/common/Table.tsx index 2987a7ca94..44a2942968 100644 --- a/packages/client-core/src/admin/common/Table.tsx +++ b/packages/client-core/src/admin/common/Table.tsx @@ -1,14 +1,14 @@ import React from 'react' -import Box from '@xrengine/ui/src/Box' -import Table from '@xrengine/ui/src/Table' -import TableBody from '@xrengine/ui/src/TableBody' -import TableCell from '@xrengine/ui/src/TableCell' -import TableContainer from '@xrengine/ui/src/TableContainer' -import TableHead from '@xrengine/ui/src/TableHead' -import TablePagination from '@xrengine/ui/src/TablePagination' -import TableRow from '@xrengine/ui/src/TableRow' -import TableSortLabel from '@xrengine/ui/src/TableSortLabel' +import Box from '@etherealengine/ui/src/Box' +import Table from '@etherealengine/ui/src/Table' +import TableBody from '@etherealengine/ui/src/TableBody' +import TableCell from '@etherealengine/ui/src/TableCell' +import TableContainer from '@etherealengine/ui/src/TableContainer' +import TableHead from '@etherealengine/ui/src/TableHead' +import TablePagination from '@etherealengine/ui/src/TablePagination' +import TableRow from '@etherealengine/ui/src/TableRow' +import TableSortLabel from '@etherealengine/ui/src/TableSortLabel' import { visuallyHidden } from '@mui/utils' diff --git a/packages/client-core/src/admin/common/variables/avatar.ts b/packages/client-core/src/admin/common/variables/avatar.ts index a1014142d7..d43ba99f2e 100644 --- a/packages/client-core/src/admin/common/variables/avatar.ts +++ b/packages/client-core/src/admin/common/variables/avatar.ts @@ -1,4 +1,4 @@ -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' export interface AvatarColumn { id: 'select' | 'id' | 'name' | 'thumbnail' | 'action' diff --git a/packages/client-core/src/admin/common/variables/resource.ts b/packages/client-core/src/admin/common/variables/resource.ts index f6e1e6a04c..2200bbcafc 100644 --- a/packages/client-core/src/admin/common/variables/resource.ts +++ b/packages/client-core/src/admin/common/variables/resource.ts @@ -1,6 +1,6 @@ import i18n from 'i18next' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' export interface ResourceColumn { id: 'id' | 'key' | 'mimeType' | 'staticResourceType' | 'thumbnail' | 'action' diff --git a/packages/client-core/src/admin/common/variables/scene.ts b/packages/client-core/src/admin/common/variables/scene.ts index f97fc50007..bbd723da24 100644 --- a/packages/client-core/src/admin/common/variables/scene.ts +++ b/packages/client-core/src/admin/common/variables/scene.ts @@ -1,4 +1,4 @@ -import { SceneData, SceneMetadata } from '@xrengine/common/src/interfaces/SceneInterface' +import { SceneData, SceneMetadata } from '@etherealengine/common/src/interfaces/SceneInterface' export interface SceneColumn { id: 'name' | 'description' | 'type' | 'entity' | 'version' | 'action' diff --git a/packages/client-core/src/admin/common/variables/server.ts b/packages/client-core/src/admin/common/variables/server.ts index cd532e861b..f2f4cbf639 100644 --- a/packages/client-core/src/admin/common/variables/server.ts +++ b/packages/client-core/src/admin/common/variables/server.ts @@ -1,4 +1,4 @@ -import { ServerPodInfo } from '@xrengine/common/src/interfaces/ServerInfo' +import { ServerPodInfo } from '@etherealengine/common/src/interfaces/ServerInfo' export interface ServerColumn { id: string diff --git a/packages/client-core/src/admin/components/Analytics/ApiLinks.tsx b/packages/client-core/src/admin/components/Analytics/ApiLinks.tsx index 411cfd695e..c7751e4ef9 100755 --- a/packages/client-core/src/admin/components/Analytics/ApiLinks.tsx +++ b/packages/client-core/src/admin/components/Analytics/ApiLinks.tsx @@ -1,21 +1,21 @@ import clsx from 'clsx' import React from 'react' -import Checkbox from '@xrengine/ui/src/Checkbox' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Paper from '@xrengine/ui/src/Paper' -import Table from '@xrengine/ui/src/Table' -import TableBody from '@xrengine/ui/src/TableBody' -import TableCell from '@xrengine/ui/src/TableCell' -import TableContainer from '@xrengine/ui/src/TableContainer' -import TableHead from '@xrengine/ui/src/TableHead' -import TablePagination from '@xrengine/ui/src/TablePagination' -import TableRow from '@xrengine/ui/src/TableRow' -import TableSortLabel from '@xrengine/ui/src/TableSortLabel' -import Toolbar from '@xrengine/ui/src/Toolbar' -import Tooltip from '@xrengine/ui/src/Tooltip' -import Typography from '@xrengine/ui/src/Typography' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Paper from '@etherealengine/ui/src/Paper' +import Table from '@etherealengine/ui/src/Table' +import TableBody from '@etherealengine/ui/src/TableBody' +import TableCell from '@etherealengine/ui/src/TableCell' +import TableContainer from '@etherealengine/ui/src/TableContainer' +import TableHead from '@etherealengine/ui/src/TableHead' +import TablePagination from '@etherealengine/ui/src/TablePagination' +import TableRow from '@etherealengine/ui/src/TableRow' +import TableSortLabel from '@etherealengine/ui/src/TableSortLabel' +import Toolbar from '@etherealengine/ui/src/Toolbar' +import Tooltip from '@etherealengine/ui/src/Tooltip' +import Typography from '@etherealengine/ui/src/Typography' import { lighten, Theme } from '@mui/material/styles' import createStyles from '@mui/styles/createStyles' diff --git a/packages/client-core/src/admin/components/Analytics/CardNumber.tsx b/packages/client-core/src/admin/components/Analytics/CardNumber.tsx index 5f297ab6a4..690f2b39b3 100755 --- a/packages/client-core/src/admin/components/Analytics/CardNumber.tsx +++ b/packages/client-core/src/admin/components/Analytics/CardNumber.tsx @@ -1,8 +1,8 @@ import React from 'react' -import Card from '@xrengine/ui/src/Card' -import CardContent from '@xrengine/ui/src/CardContent' -import Typography from '@xrengine/ui/src/Typography' +import Card from '@etherealengine/ui/src/Card' +import CardContent from '@etherealengine/ui/src/CardContent' +import Typography from '@etherealengine/ui/src/Typography' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Analytics/index.tsx b/packages/client-core/src/admin/components/Analytics/index.tsx index 1e9e3c3567..ce5b23a592 100755 --- a/packages/client-core/src/admin/components/Analytics/index.tsx +++ b/packages/client-core/src/admin/components/Analytics/index.tsx @@ -3,10 +3,10 @@ import moment from 'moment' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Box from '@xrengine/ui/src/Box' -import TextField from '@xrengine/ui/src/TextField' -import ToggleButton from '@xrengine/ui/src/ToggleButton' -import ToggleButtonGroup from '@xrengine/ui/src/ToggleButtonGroup' +import Box from '@etherealengine/ui/src/Box' +import TextField from '@etherealengine/ui/src/TextField' +import ToggleButton from '@etherealengine/ui/src/ToggleButton' +import ToggleButtonGroup from '@etherealengine/ui/src/ToggleButtonGroup' import DateAdapter from '@mui/lab/AdapterMoment' import LocalizationProvider from '@mui/lab/LocalizationProvider' diff --git a/packages/client-core/src/admin/components/Avatars/AvatarDrawer.tsx b/packages/client-core/src/admin/components/Avatars/AvatarDrawer.tsx index 23780f2bd0..813950b60b 100755 --- a/packages/client-core/src/admin/components/Avatars/AvatarDrawer.tsx +++ b/packages/client-core/src/admin/components/Avatars/AvatarDrawer.tsx @@ -1,12 +1,12 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import InputFile from '@xrengine/client-core/src/common/components/InputFile' -import InputRadio from '@xrengine/client-core/src/common/components/InputRadio' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import { getCanvasBlob, isValidHttpUrl } from '@xrengine/client-core/src/common/utils' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import InputFile from '@etherealengine/client-core/src/common/components/InputFile' +import InputRadio from '@etherealengine/client-core/src/common/components/InputRadio' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import { getCanvasBlob, isValidHttpUrl } from '@etherealengine/client-core/src/common/utils' import { AVATAR_FILE_ALLOWED_EXTENSIONS, MAX_AVATAR_FILE_SIZE, @@ -16,22 +16,22 @@ import { THUMBNAIL_FILE_ALLOWED_EXTENSIONS, THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH -} from '@xrengine/common/src/constants/AvatarConstants' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { AvatarRigComponent } from '@xrengine/engine/src/avatar/components/AvatarAnimationComponent' -import { getOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { dispatchAction } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import FormControl from '@xrengine/ui/src/FormControl' -import FormHelperText from '@xrengine/ui/src/FormHelperText' -import Icon from '@xrengine/ui/src/Icon' -import Tooltip from '@xrengine/ui/src/Tooltip' -import Typography from '@xrengine/ui/src/Typography' +} from '@etherealengine/common/src/constants/AvatarConstants' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { AvatarRigComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent' +import { getOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { dispatchAction } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import FormControl from '@etherealengine/ui/src/FormControl' +import FormHelperText from '@etherealengine/ui/src/FormHelperText' +import Icon from '@etherealengine/ui/src/Icon' +import Tooltip from '@etherealengine/ui/src/Tooltip' +import Typography from '@etherealengine/ui/src/Typography' import { NotificationService } from '../../../common/services/NotificationService' import { loadAvatarForPreview, resetAnimationLogic } from '../../../user/components/Panel3D/helperFunctions' diff --git a/packages/client-core/src/admin/components/Avatars/AvatarTable.tsx b/packages/client-core/src/admin/components/Avatars/AvatarTable.tsx index 6a57cc8f32..7a3ee520f2 100755 --- a/packages/client-core/src/admin/components/Avatars/AvatarTable.tsx +++ b/packages/client-core/src/admin/components/Avatars/AvatarTable.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import Box from '@xrengine/ui/src/Box' -import Checkbox from '@xrengine/ui/src/Checkbox' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import Box from '@etherealengine/ui/src/Box' +import Checkbox from '@etherealengine/ui/src/Checkbox' import { useAuthState } from '../../../user/services/AuthService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Avatars/index.tsx b/packages/client-core/src/admin/components/Avatars/index.tsx index dc127fd2c1..cde3085645 100644 --- a/packages/client-core/src/admin/components/Avatars/index.tsx +++ b/packages/client-core/src/admin/components/Avatars/index.tsx @@ -1,19 +1,19 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { AvatarClientModule } from '@xrengine/engine/src/avatar/AvatarClientModule' -import { AvatarCommonModule } from '@xrengine/engine/src/avatar/AvatarCommonModule' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { initSystems, unloadSystems } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { SceneClientModule } from '@xrengine/engine/src/scene/SceneClientModule' -import { SceneCommonModule } from '@xrengine/engine/src/scene/SceneCommonModule' -import { TransformModule } from '@xrengine/engine/src/transform/TransformModule' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { AvatarClientModule } from '@etherealengine/engine/src/avatar/AvatarClientModule' +import { AvatarCommonModule } from '@etherealengine/engine/src/avatar/AvatarCommonModule' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { initSystems, unloadSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { SceneClientModule } from '@etherealengine/engine/src/scene/SceneClientModule' +import { SceneCommonModule } from '@etherealengine/engine/src/scene/SceneCommonModule' +import { TransformModule } from '@etherealengine/engine/src/transform/TransformModule' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import Search from '../../common/Search' import { AdminAvatarService } from '../../services/AvatarService' diff --git a/packages/client-core/src/admin/components/Benchmarking/index.tsx b/packages/client-core/src/admin/components/Benchmarking/index.tsx index ca97b97baf..8ee888d29a 100755 --- a/packages/client-core/src/admin/components/Benchmarking/index.tsx +++ b/packages/client-core/src/admin/components/Benchmarking/index.tsx @@ -1,10 +1,10 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import multiLogger from '@xrengine/common/src/logger' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import multiLogger from '@etherealengine/common/src/logger' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { TestBotService, useTestBotState } from '../../services/TestBotService' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Bots/CreateBot.tsx b/packages/client-core/src/admin/components/Bots/CreateBot.tsx index 13fd7f1148..c5672861e7 100644 --- a/packages/client-core/src/admin/components/Bots/CreateBot.tsx +++ b/packages/client-core/src/admin/components/Bots/CreateBot.tsx @@ -2,18 +2,18 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { v4 as uuidv4 } from 'uuid' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { BotCommands, CreateBotAsAdmin } from '@xrengine/common/src/interfaces/AdminBot' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import Button from '@xrengine/ui/src/Button' -import Card from '@xrengine/ui/src/Card' -import CardContent from '@xrengine/ui/src/CardContent' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Paper from '@xrengine/ui/src/Paper' -import Typography from '@xrengine/ui/src/Typography' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { BotCommands, CreateBotAsAdmin } from '@etherealengine/common/src/interfaces/AdminBot' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import Button from '@etherealengine/ui/src/Button' +import Card from '@etherealengine/ui/src/Card' +import CardContent from '@etherealengine/ui/src/CardContent' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Paper from '@etherealengine/ui/src/Paper' +import Typography from '@etherealengine/ui/src/Typography' import { NotificationService } from '../../../common/services/NotificationService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Bots/DisplayBots.tsx b/packages/client-core/src/admin/components/Bots/DisplayBots.tsx index 6aeafb99fa..aabf80ed08 100644 --- a/packages/client-core/src/admin/components/Bots/DisplayBots.tsx +++ b/packages/client-core/src/admin/components/Bots/DisplayBots.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { AdminBot, BotCommands, CreateBotCammand } from '@xrengine/common/src/interfaces/AdminBot' -import Accordion from '@xrengine/ui/src/Accordion' -import AccordionDetails from '@xrengine/ui/src/AccordionDetails' -import AccordionSummary from '@xrengine/ui/src/AccordionSummary' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Typography from '@xrengine/ui/src/Typography' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { AdminBot, BotCommands, CreateBotCammand } from '@etherealengine/common/src/interfaces/AdminBot' +import Accordion from '@etherealengine/ui/src/Accordion' +import AccordionDetails from '@etherealengine/ui/src/AccordionDetails' +import AccordionSummary from '@etherealengine/ui/src/AccordionSummary' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Typography from '@etherealengine/ui/src/Typography' import { NotificationService } from '../../../common/services/NotificationService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Bots/UpdateBot.tsx b/packages/client-core/src/admin/components/Bots/UpdateBot.tsx index 424ad9603a..c0c599fd9a 100644 --- a/packages/client-core/src/admin/components/Bots/UpdateBot.tsx +++ b/packages/client-core/src/admin/components/Bots/UpdateBot.tsx @@ -1,18 +1,18 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { CreateBotAsAdmin } from '@xrengine/common/src/interfaces/AdminBot' -import { AdminBot } from '@xrengine/common/src/interfaces/AdminBot' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import Button from '@xrengine/ui/src/Button' -import Dialog from '@xrengine/ui/src/Dialog' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogContent from '@xrengine/ui/src/DialogContent' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { CreateBotAsAdmin } from '@etherealengine/common/src/interfaces/AdminBot' +import { AdminBot } from '@etherealengine/common/src/interfaces/AdminBot' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import Button from '@etherealengine/ui/src/Button' +import Dialog from '@etherealengine/ui/src/Dialog' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogContent from '@etherealengine/ui/src/DialogContent' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { NotificationService } from '../../../common/services/NotificationService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Bots/index.tsx b/packages/client-core/src/admin/components/Bots/index.tsx index f1fca87bee..f091cad4d3 100644 --- a/packages/client-core/src/admin/components/Bots/index.tsx +++ b/packages/client-core/src/admin/components/Bots/index.tsx @@ -1,11 +1,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import Card from '@xrengine/ui/src/Card' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import Paper from '@xrengine/ui/src/Paper' -import Typography from '@xrengine/ui/src/Typography' +import Card from '@etherealengine/ui/src/Card' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import Paper from '@etherealengine/ui/src/Paper' +import Typography from '@etherealengine/ui/src/Typography' import styles from '../../styles/admin.module.scss' import CreateBot from './CreateBot' @@ -25,7 +25,7 @@ const Bots = () => { - {t('admin:components.bot.xrEngineBots')} + {t('admin:components.bot.engineBots')} diff --git a/packages/client-core/src/admin/components/Group/GroupDrawer.tsx b/packages/client-core/src/admin/components/Group/GroupDrawer.tsx index d46fb0d816..3333bcc0ae 100644 --- a/packages/client-core/src/admin/components/Group/GroupDrawer.tsx +++ b/packages/client-core/src/admin/components/Group/GroupDrawer.tsx @@ -1,18 +1,18 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import AutoComplete, { AutoCompleteData } from '@xrengine/client-core/src/common/components/AutoComplete' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { CreateGroup, Group, GroupScope } from '@xrengine/common/src/interfaces/Group' -import Avatar from '@xrengine/ui/src/Avatar' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogContentText from '@xrengine/ui/src/DialogContentText' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import AutoComplete, { AutoCompleteData } from '@etherealengine/client-core/src/common/components/AutoComplete' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { CreateGroup, Group, GroupScope } from '@etherealengine/common/src/interfaces/Group' +import Avatar from '@etherealengine/ui/src/Avatar' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogContentText from '@etherealengine/ui/src/DialogContentText' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { NotificationService } from '../../../common/services/NotificationService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Group/GroupTable.tsx b/packages/client-core/src/admin/components/Group/GroupTable.tsx index 70efd81a01..46bc645abe 100644 --- a/packages/client-core/src/admin/components/Group/GroupTable.tsx +++ b/packages/client-core/src/admin/components/Group/GroupTable.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { Group } from '@xrengine/common/src/interfaces/Group' -import Box from '@xrengine/ui/src/Box' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { Group } from '@etherealengine/common/src/interfaces/Group' +import Box from '@etherealengine/ui/src/Box' import { useAuthState } from '../../../user/services/AuthService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Group/index.tsx b/packages/client-core/src/admin/components/Group/index.tsx index 155976cd55..97f4b102fb 100644 --- a/packages/client-core/src/admin/components/Group/index.tsx +++ b/packages/client-core/src/admin/components/Group/index.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' import Search from '../../common/Search' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Instance/InstanceTable.tsx b/packages/client-core/src/admin/components/Instance/InstanceTable.tsx index 9217c59493..616d1de583 100644 --- a/packages/client-core/src/admin/components/Instance/InstanceTable.tsx +++ b/packages/client-core/src/admin/components/Instance/InstanceTable.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { Location } from '@xrengine/common/src/interfaces/Location' -import Box from '@xrengine/ui/src/Box' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { Location } from '@etherealengine/common/src/interfaces/Location' +import Box from '@etherealengine/ui/src/Box' import { useAuthState } from '../../../user/services/AuthService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Instance/PatchInstanceserver.tsx b/packages/client-core/src/admin/components/Instance/PatchInstanceserver.tsx index a2a35ce3ca..189a05c40b 100644 --- a/packages/client-core/src/admin/components/Instance/PatchInstanceserver.tsx +++ b/packages/client-core/src/admin/components/Instance/PatchInstanceserver.tsx @@ -2,12 +2,12 @@ import { useState } from '@hookstate/core' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' import { useAuthState } from '../../../user/services/AuthService' import DrawerView from '../../common/DrawerView' diff --git a/packages/client-core/src/admin/components/Instance/index.tsx b/packages/client-core/src/admin/components/Instance/index.tsx index 9c974967b6..b18438ab3d 100644 --- a/packages/client-core/src/admin/components/Instance/index.tsx +++ b/packages/client-core/src/admin/components/Instance/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from 'react' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' import { NotificationService } from '../../../common/services/NotificationService' import Search from '../../common/Search' diff --git a/packages/client-core/src/admin/components/Invite/AdminInvites.tsx b/packages/client-core/src/admin/components/Invite/AdminInvites.tsx index 69bec70031..94e95b0059 100755 --- a/packages/client-core/src/admin/components/Invite/AdminInvites.tsx +++ b/packages/client-core/src/admin/components/Invite/AdminInvites.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { InviteInterface } from '@xrengine/common/src/interfaces/Invite' -import Checkbox from '@xrengine/ui/src/Checkbox' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { InviteInterface } from '@etherealengine/common/src/interfaces/Invite' +import Checkbox from '@etherealengine/ui/src/Checkbox' import { INVITE_PAGE_LIMIT } from '../../../social/services/InviteService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Invite/CreateInviteModal.tsx b/packages/client-core/src/admin/components/Invite/CreateInviteModal.tsx index e446145a81..3d554217d6 100755 --- a/packages/client-core/src/admin/components/Invite/CreateInviteModal.tsx +++ b/packages/client-core/src/admin/components/Invite/CreateInviteModal.tsx @@ -2,20 +2,20 @@ import classNames from 'classnames' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { SendInvite } from '@xrengine/common/src/interfaces/Invite' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import Container from '@xrengine/ui/src/Container' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import FormGroup from '@xrengine/ui/src/FormGroup' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Tab from '@xrengine/ui/src/Tab' -import Tabs from '@xrengine/ui/src/Tabs' -import TextField from '@xrengine/ui/src/TextField' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { SendInvite } from '@etherealengine/common/src/interfaces/Invite' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import Container from '@etherealengine/ui/src/Container' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import FormGroup from '@etherealengine/ui/src/FormGroup' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Tab from '@etherealengine/ui/src/Tab' +import Tabs from '@etherealengine/ui/src/Tabs' +import TextField from '@etherealengine/ui/src/TextField' import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment' import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker' diff --git a/packages/client-core/src/admin/components/Invite/UpdateInviteModal.tsx b/packages/client-core/src/admin/components/Invite/UpdateInviteModal.tsx index 09f6ca0c74..6829d47fdc 100755 --- a/packages/client-core/src/admin/components/Invite/UpdateInviteModal.tsx +++ b/packages/client-core/src/admin/components/Invite/UpdateInviteModal.tsx @@ -2,20 +2,20 @@ import classNames from 'classnames' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { InviteInterface } from '@xrengine/common/src/interfaces/Invite' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import Container from '@xrengine/ui/src/Container' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import FormGroup from '@xrengine/ui/src/FormGroup' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Tab from '@xrengine/ui/src/Tab' -import Tabs from '@xrengine/ui/src/Tabs' -import TextField from '@xrengine/ui/src/TextField' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { InviteInterface } from '@etherealengine/common/src/interfaces/Invite' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import Container from '@etherealengine/ui/src/Container' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import FormGroup from '@etherealengine/ui/src/FormGroup' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Tab from '@etherealengine/ui/src/Tab' +import Tabs from '@etherealengine/ui/src/Tabs' +import TextField from '@etherealengine/ui/src/TextField' import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment' import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker' diff --git a/packages/client-core/src/admin/components/Invite/index.tsx b/packages/client-core/src/admin/components/Invite/index.tsx index 92002126e5..af19936ed5 100755 --- a/packages/client-core/src/admin/components/Invite/index.tsx +++ b/packages/client-core/src/admin/components/Invite/index.tsx @@ -2,12 +2,12 @@ import { ConfirmProvider } from 'material-ui-confirm' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { useAuthState } from '../../../user/services/AuthService' import Search from '../../common/Search' diff --git a/packages/client-core/src/admin/components/Location/LocationDrawer.tsx b/packages/client-core/src/admin/components/Location/LocationDrawer.tsx index cdf82b674a..f209e211e7 100644 --- a/packages/client-core/src/admin/components/Location/LocationDrawer.tsx +++ b/packages/client-core/src/admin/components/Location/LocationDrawer.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { LocationFetched } from '@xrengine/common/src/interfaces/Location' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Grid from '@xrengine/ui/src/Grid' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { LocationFetched } from '@etherealengine/common/src/interfaces/Location' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Grid from '@etherealengine/ui/src/Grid' import { NotificationService } from '../../../common/services/NotificationService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Location/LocationTable.tsx b/packages/client-core/src/admin/components/Location/LocationTable.tsx index 4d3f050c60..296a8b913e 100644 --- a/packages/client-core/src/admin/components/Location/LocationTable.tsx +++ b/packages/client-core/src/admin/components/Location/LocationTable.tsx @@ -1,12 +1,12 @@ import React, { ReactElement, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { Location } from '@xrengine/common/src/interfaces/Location' -import Avatar from '@xrengine/ui/src/Avatar' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Chip from '@xrengine/ui/src/Chip' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { Location } from '@etherealengine/common/src/interfaces/Location' +import Avatar from '@etherealengine/ui/src/Avatar' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Chip from '@etherealengine/ui/src/Chip' import { useAuthState } from '../../../user/services/AuthService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Location/index.tsx b/packages/client-core/src/admin/components/Location/index.tsx index f2957dbc91..291d81ce14 100644 --- a/packages/client-core/src/admin/components/Location/index.tsx +++ b/packages/client-core/src/admin/components/Location/index.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' import Search from '../../common/Search' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Party/PartyDrawer.tsx b/packages/client-core/src/admin/components/Party/PartyDrawer.tsx index b73e295b8b..2043026ff4 100644 --- a/packages/client-core/src/admin/components/Party/PartyDrawer.tsx +++ b/packages/client-core/src/admin/components/Party/PartyDrawer.tsx @@ -1,13 +1,13 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { Party } from '@xrengine/common/src/interfaces/Party' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { Party } from '@etherealengine/common/src/interfaces/Party' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' import { NotificationService } from '../../../common/services/NotificationService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Party/PartyTable.tsx b/packages/client-core/src/admin/components/Party/PartyTable.tsx index 238bd29006..b3b08b35ea 100644 --- a/packages/client-core/src/admin/components/Party/PartyTable.tsx +++ b/packages/client-core/src/admin/components/Party/PartyTable.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { Party } from '@xrengine/common/src/interfaces/Party' -import Box from '@xrengine/ui/src/Box' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { Party } from '@etherealengine/common/src/interfaces/Party' +import Box from '@etherealengine/ui/src/Box' import { useAuthState } from '../../../user/services/AuthService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Party/index.tsx b/packages/client-core/src/admin/components/Party/index.tsx index d9f2435ac3..a5aec48fa0 100644 --- a/packages/client-core/src/admin/components/Party/index.tsx +++ b/packages/client-core/src/admin/components/Party/index.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' import Search from '../../common/Search' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Project/BuildStatusDrawer.tsx b/packages/client-core/src/admin/components/Project/BuildStatusDrawer.tsx index 8a0cc47767..8605742de4 100644 --- a/packages/client-core/src/admin/components/Project/BuildStatusDrawer.tsx +++ b/packages/client-core/src/admin/components/Project/BuildStatusDrawer.tsx @@ -1,12 +1,12 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { BuildStatus } from '@xrengine/common/src/interfaces/BuildStatus' -import Box from '@xrengine/ui/src/Box' -import Container from '@xrengine/ui/src/Container' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import { BuildStatus } from '@etherealengine/common/src/interfaces/BuildStatus' +import Box from '@etherealengine/ui/src/Box' +import Container from '@etherealengine/ui/src/Container' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import DrawerView from '../../common/DrawerView' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Project/BuildStatusLogsModal.tsx b/packages/client-core/src/admin/components/Project/BuildStatusLogsModal.tsx index 7c0f692e78..2dea215dee 100755 --- a/packages/client-core/src/admin/components/Project/BuildStatusLogsModal.tsx +++ b/packages/client-core/src/admin/components/Project/BuildStatusLogsModal.tsx @@ -1,11 +1,11 @@ import classNames from 'classnames' import React, { useEffect, useState } from 'react' -import { BuildStatus } from '@xrengine/common/src/interfaces/BuildStatus' -import Fade from '@xrengine/ui/src/Fade' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Modal from '@xrengine/ui/src/Modal' +import { BuildStatus } from '@etherealengine/common/src/interfaces/BuildStatus' +import Fade from '@etherealengine/ui/src/Fade' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Modal from '@etherealengine/ui/src/Modal' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Project/ProjectDrawer.tsx b/packages/client-core/src/admin/components/Project/ProjectDrawer.tsx index 2388400ae3..570224c06d 100644 --- a/packages/client-core/src/admin/components/Project/ProjectDrawer.tsx +++ b/packages/client-core/src/admin/components/Project/ProjectDrawer.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' import { DefaultUpdateSchedule, ProjectInterface, ProjectUpdateType -} from '@xrengine/common/src/interfaces/ProjectInterface' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' +} from '@etherealengine/common/src/interfaces/ProjectInterface' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' import { NotificationService } from '../../../common/services/NotificationService' import { ProjectService } from '../../../common/services/ProjectService' diff --git a/packages/client-core/src/admin/components/Project/ProjectFields.tsx b/packages/client-core/src/admin/components/Project/ProjectFields.tsx index 23b9a76824..d836338e15 100644 --- a/packages/client-core/src/admin/components/Project/ProjectFields.tsx +++ b/packages/client-core/src/admin/components/Project/ProjectFields.tsx @@ -2,26 +2,26 @@ import classNames from 'classnames' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Autocomplete from '@xrengine/client-core/src/common/components/AutoCompleteSingle' -import InputRadio from '@xrengine/client-core/src/common/components/InputRadio' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import { ProjectBranchInterface } from '@xrengine/common/src/interfaces/ProjectBranchInterface' -import { ProjectCommitInterface } from '@xrengine/common/src/interfaces/ProjectCommitInterface' +import Autocomplete from '@etherealengine/client-core/src/common/components/AutoCompleteSingle' +import InputRadio from '@etherealengine/client-core/src/common/components/InputRadio' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import { ProjectBranchInterface } from '@etherealengine/common/src/interfaces/ProjectBranchInterface' +import { ProjectCommitInterface } from '@etherealengine/common/src/interfaces/ProjectCommitInterface' import { DefaultUpdateSchedule, ProjectInterface, ProjectUpdateType -} from '@xrengine/common/src/interfaces/ProjectInterface' -import Box from '@xrengine/ui/src/Box' -import Container from '@xrengine/ui/src/Container' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import TextField from '@xrengine/ui/src/TextField' -import Tooltip from '@xrengine/ui/src/Tooltip' +} from '@etherealengine/common/src/interfaces/ProjectInterface' +import Box from '@etherealengine/ui/src/Box' +import Container from '@etherealengine/ui/src/Container' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import TextField from '@etherealengine/ui/src/TextField' +import Tooltip from '@etherealengine/ui/src/Tooltip' import { ProjectService } from '../../../common/services/ProjectService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Project/ProjectFilesDrawer.tsx b/packages/client-core/src/admin/components/Project/ProjectFilesDrawer.tsx index c97ec286cb..96590ae45a 100644 --- a/packages/client-core/src/admin/components/Project/ProjectFilesDrawer.tsx +++ b/packages/client-core/src/admin/components/Project/ProjectFilesDrawer.tsx @@ -1,15 +1,15 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { ProjectInterface } from '@xrengine/common/src/interfaces/ProjectInterface' +import { ProjectInterface } from '@etherealengine/common/src/interfaces/ProjectInterface' import { AssetSelectionChangePropsType, AssetsPreviewPanel -} from '@xrengine/editor/src/components/assets/AssetsPreviewPanel' -import FileBrowserContentPanel from '@xrengine/editor/src/components/assets/FileBrowserContentPanel' -import Box from '@xrengine/ui/src/Box' -import Container from '@xrengine/ui/src/Container' -import DialogTitle from '@xrengine/ui/src/DialogTitle' +} from '@etherealengine/editor/src/components/assets/AssetsPreviewPanel' +import FileBrowserContentPanel from '@etherealengine/editor/src/components/assets/FileBrowserContentPanel' +import Box from '@etherealengine/ui/src/Box' +import Container from '@etherealengine/ui/src/Container' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' import DrawerView from '../../common/DrawerView' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Project/ProjectTable.tsx b/packages/client-core/src/admin/components/Project/ProjectTable.tsx index f32cda391f..52f5ed9205 100644 --- a/packages/client-core/src/admin/components/Project/ProjectTable.tsx +++ b/packages/client-core/src/admin/components/Project/ProjectTable.tsx @@ -1,13 +1,13 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { ProjectInterface } from '@xrengine/common/src/interfaces/ProjectInterface' -import multiLogger from '@xrengine/common/src/logger' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Tooltip from '@xrengine/ui/src/Tooltip' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { ProjectInterface } from '@etherealengine/common/src/interfaces/ProjectInterface' +import multiLogger from '@etherealengine/common/src/logger' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Tooltip from '@etherealengine/ui/src/Tooltip' import { NotificationService } from '../../../common/services/NotificationService' import { PROJECT_PAGE_LIMIT, ProjectService, useProjectState } from '../../../common/services/ProjectService' diff --git a/packages/client-core/src/admin/components/Project/UpdateDrawer.tsx b/packages/client-core/src/admin/components/Project/UpdateDrawer.tsx index 8f3d2ccf71..4bee8918d5 100644 --- a/packages/client-core/src/admin/components/Project/UpdateDrawer.tsx +++ b/packages/client-core/src/admin/components/Project/UpdateDrawer.tsx @@ -2,21 +2,21 @@ import classNames from 'classnames' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import { BuilderTag } from '@xrengine/common/src/interfaces/BuilderTags' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import { BuilderTag } from '@etherealengine/common/src/interfaces/BuilderTags' import { DefaultUpdateSchedule, ProjectInterface, ProjectUpdateType -} from '@xrengine/common/src/interfaces/ProjectInterface' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import Icon from '@xrengine/ui/src/Icon' +} from '@etherealengine/common/src/interfaces/ProjectInterface' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import Icon from '@etherealengine/ui/src/Icon' import { ProjectService, useProjectState } from '../../../common/services/ProjectService' import DrawerView from '../../common/DrawerView' diff --git a/packages/client-core/src/admin/components/Project/UserPermissionDrawer.tsx b/packages/client-core/src/admin/components/Project/UserPermissionDrawer.tsx index 2b6e059b4c..885b3d462d 100644 --- a/packages/client-core/src/admin/components/Project/UserPermissionDrawer.tsx +++ b/packages/client-core/src/admin/components/Project/UserPermissionDrawer.tsx @@ -1,19 +1,19 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { ProjectInterface } from '@xrengine/common/src/interfaces/ProjectInterface' -import { ProjectPermissionInterface } from '@xrengine/common/src/interfaces/ProjectPermissionInterface' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import List from '@xrengine/ui/src/List' -import ListItem from '@xrengine/ui/src/ListItem' -import ListItemText from '@xrengine/ui/src/ListItemText' -import Switch from '@xrengine/ui/src/Switch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { ProjectInterface } from '@etherealengine/common/src/interfaces/ProjectInterface' +import { ProjectPermissionInterface } from '@etherealengine/common/src/interfaces/ProjectPermissionInterface' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import List from '@etherealengine/ui/src/List' +import ListItem from '@etherealengine/ui/src/ListItem' +import ListItemText from '@etherealengine/ui/src/ListItemText' +import Switch from '@etherealengine/ui/src/Switch' import { NotificationService } from '../../../common/services/NotificationService' import { ProjectService } from '../../../common/services/ProjectService' diff --git a/packages/client-core/src/admin/components/Project/ViewProjectFiles.tsx b/packages/client-core/src/admin/components/Project/ViewProjectFiles.tsx index 93ae71cbb4..1fc6a8433a 100644 --- a/packages/client-core/src/admin/components/Project/ViewProjectFiles.tsx +++ b/packages/client-core/src/admin/components/Project/ViewProjectFiles.tsx @@ -4,10 +4,10 @@ import React from 'react' import { AssetSelectionChangePropsType, AssetsPreviewPanel -} from '@xrengine/editor/src/components/assets/AssetsPreviewPanel' -import FileBrowserContentPanel from '@xrengine/editor/src/components/assets/FileBrowserContentPanel' -import { DndWrapper } from '@xrengine/editor/src/components/dnd/DndWrapper' -import { DockContainer } from '@xrengine/editor/src/components/EditorContainer' +} from '@etherealengine/editor/src/components/assets/AssetsPreviewPanel' +import FileBrowserContentPanel from '@etherealengine/editor/src/components/assets/FileBrowserContentPanel' +import { DndWrapper } from '@etherealengine/editor/src/components/dnd/DndWrapper' +import { DockContainer } from '@etherealengine/editor/src/components/EditorContainer' import DrawerView from '../../common/DrawerView' diff --git a/packages/client-core/src/admin/components/Project/index.tsx b/packages/client-core/src/admin/components/Project/index.tsx index 0c2f73f772..370237ede5 100755 --- a/packages/client-core/src/admin/components/Project/index.tsx +++ b/packages/client-core/src/admin/components/Project/index.tsx @@ -1,14 +1,14 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { initSystems } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { useHookstate } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Chip from '@xrengine/ui/src/Chip' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Grid from '@xrengine/ui/src/Grid' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { initSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { useHookstate } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Chip from '@etherealengine/ui/src/Chip' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Grid from '@etherealengine/ui/src/Grid' import { ProjectService, useProjectState } from '../../../common/services/ProjectService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Resources/ResourceDrawer.tsx b/packages/client-core/src/admin/components/Resources/ResourceDrawer.tsx index aa5b20318f..238b109057 100755 --- a/packages/client-core/src/admin/components/Resources/ResourceDrawer.tsx +++ b/packages/client-core/src/admin/components/Resources/ResourceDrawer.tsx @@ -1,25 +1,25 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputFile from '@xrengine/client-core/src/common/components/InputFile' -import InputRadio from '@xrengine/client-core/src/common/components/InputRadio' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { MAX_AVATAR_FILE_SIZE, MIN_AVATAR_FILE_SIZE } from '@xrengine/common/src/constants/AvatarConstants' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' +import InputFile from '@etherealengine/client-core/src/common/components/InputFile' +import InputRadio from '@etherealengine/client-core/src/common/components/InputRadio' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { MAX_AVATAR_FILE_SIZE, MIN_AVATAR_FILE_SIZE } from '@etherealengine/common/src/constants/AvatarConstants' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' import { AssetSelectionChangePropsType, AssetsPreviewPanel -} from '@xrengine/editor/src/components/assets/AssetsPreviewPanel' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import FormControl from '@xrengine/ui/src/FormControl' -import FormHelperText from '@xrengine/ui/src/FormHelperText' -import Icon from '@xrengine/ui/src/Icon' -import Typography from '@xrengine/ui/src/Typography' +} from '@etherealengine/editor/src/components/assets/AssetsPreviewPanel' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import FormControl from '@etherealengine/ui/src/FormControl' +import FormHelperText from '@etherealengine/ui/src/FormHelperText' +import Icon from '@etherealengine/ui/src/Icon' +import Typography from '@etherealengine/ui/src/Typography' import { NotificationService } from '../../../common/services/NotificationService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Resources/ResourceTable.tsx b/packages/client-core/src/admin/components/Resources/ResourceTable.tsx index 3deae7cdec..6a7471aaba 100755 --- a/packages/client-core/src/admin/components/Resources/ResourceTable.tsx +++ b/packages/client-core/src/admin/components/Resources/ResourceTable.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' -import Box from '@xrengine/ui/src/Box' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' +import Box from '@etherealengine/ui/src/Box' import { useAuthState } from '../../../user/services/AuthService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Resources/index.tsx b/packages/client-core/src/admin/components/Resources/index.tsx index 99e0af38d7..3baf7591c1 100644 --- a/packages/client-core/src/admin/components/Resources/index.tsx +++ b/packages/client-core/src/admin/components/Resources/index.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Popover from '@xrengine/ui/src/Popover' -import Typography from '@xrengine/ui/src/Typography' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Popover from '@etherealengine/ui/src/Popover' +import Typography from '@etherealengine/ui/src/Typography' import Search from '../../common/Search' import { ResourceService, useAdminResourceState } from '../../services/ResourceService' diff --git a/packages/client-core/src/admin/components/Routes/RouteTable.tsx b/packages/client-core/src/admin/components/Routes/RouteTable.tsx index aacbf2fe15..6799b7d8df 100644 --- a/packages/client-core/src/admin/components/Routes/RouteTable.tsx +++ b/packages/client-core/src/admin/components/Routes/RouteTable.tsx @@ -1,8 +1,8 @@ import React, { ChangeEvent, useEffect, useState } from 'react' -import Box from '@xrengine/ui/src/Box' -import Checkbox from '@xrengine/ui/src/Checkbox' -import CircularProgress from '@xrengine/ui/src/CircularProgress' +import Box from '@etherealengine/ui/src/Box' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' import { useAuthState } from '../../../user/services/AuthService' import TableComponent from '../../common/Table' diff --git a/packages/client-core/src/admin/components/Server/ServerItemCard.tsx b/packages/client-core/src/admin/components/Server/ServerItemCard.tsx index c2de761610..25eec6a717 100644 --- a/packages/client-core/src/admin/components/Server/ServerItemCard.tsx +++ b/packages/client-core/src/admin/components/Server/ServerItemCard.tsx @@ -1,6 +1,6 @@ import React, { memo } from 'react' -import { ServerInfoInterface } from '@xrengine/common/src/interfaces/ServerInfo' +import { ServerInfoInterface } from '@etherealengine/common/src/interfaces/ServerInfo' import { Card, CardActionArea, CardContent, Typography } from '@mui/material' diff --git a/packages/client-core/src/admin/components/Server/ServerLogs.tsx b/packages/client-core/src/admin/components/Server/ServerLogs.tsx index f5dfebe182..32086e6a81 100755 --- a/packages/client-core/src/admin/components/Server/ServerLogs.tsx +++ b/packages/client-core/src/admin/components/Server/ServerLogs.tsx @@ -1,13 +1,13 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import multiLogger from '@xrengine/common/src/logger' -import Box from '@xrengine/ui/src/Box' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import multiLogger from '@etherealengine/common/src/logger' +import Box from '@etherealengine/ui/src/Box' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { useServerInfoState } from '../../services/ServerInfoService' import { ServerLogsService, useServerLogsState } from '../../services/ServerLogsService' diff --git a/packages/client-core/src/admin/components/Server/ServerTable.tsx b/packages/client-core/src/admin/components/Server/ServerTable.tsx index df4db0b5d8..e7814fa8e8 100755 --- a/packages/client-core/src/admin/components/Server/ServerTable.tsx +++ b/packages/client-core/src/admin/components/Server/ServerTable.tsx @@ -3,15 +3,15 @@ import en from 'javascript-time-ago/locale/en' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import config from '@xrengine/common/src/config' -import { ServerPodInfo } from '@xrengine/common/src/interfaces/ServerInfo' -import multiLogger from '@xrengine/common/src/logger' -import Box from '@xrengine/ui/src/Box' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import config from '@etherealengine/common/src/config' +import { ServerPodInfo } from '@etherealengine/common/src/interfaces/ServerInfo' +import multiLogger from '@etherealengine/common/src/logger' +import Box from '@etherealengine/ui/src/Box' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import TableComponent from '../../common/Table' import { ServerColumn, ServerPodData } from '../../common/variables/server' diff --git a/packages/client-core/src/admin/components/Server/index.tsx b/packages/client-core/src/admin/components/Server/index.tsx index b7360a265f..384f4b0a42 100644 --- a/packages/client-core/src/admin/components/Server/index.tsx +++ b/packages/client-core/src/admin/components/Server/index.tsx @@ -2,14 +2,14 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { ReflexContainer, ReflexElement, ReflexSplitter } from 'react-reflex' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import { ServerInfoInterface } from '@xrengine/common/src/interfaces/ServerInfo' -import Box from '@xrengine/ui/src/Box' -import Card from '@xrengine/ui/src/Card' -import CardActionArea from '@xrengine/ui/src/CardActionArea' -import CardContent from '@xrengine/ui/src/CardContent' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import { ServerInfoInterface } from '@etherealengine/common/src/interfaces/ServerInfo' +import Box from '@etherealengine/ui/src/Box' +import Card from '@etherealengine/ui/src/Card' +import CardActionArea from '@etherealengine/ui/src/CardActionArea' +import CardContent from '@etherealengine/ui/src/CardContent' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { ServerInfoService, useServerInfoState } from '../../services/ServerInfoService' import styles from '../../styles/admin.module.scss' diff --git a/packages/client-core/src/admin/components/Setting/Authentication.tsx b/packages/client-core/src/admin/components/Setting/Authentication.tsx index 49f987c1e4..0504a87ee3 100644 --- a/packages/client-core/src/admin/components/Setting/Authentication.tsx +++ b/packages/client-core/src/admin/components/Setting/Authentication.tsx @@ -2,13 +2,13 @@ import { Icon } from '@iconify/react' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import IconButton from '@xrengine/ui/src/IconButton' -import Typography from '@xrengine/ui/src/Typography' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import IconButton from '@etherealengine/ui/src/IconButton' +import Typography from '@etherealengine/ui/src/Typography' import { initialAuthState } from '../../../common/initialAuthState' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/components/Setting/Aws.tsx b/packages/client-core/src/admin/components/Setting/Aws.tsx index b8807c28b9..bd45894e1e 100644 --- a/packages/client-core/src/admin/components/Setting/Aws.tsx +++ b/packages/client-core/src/admin/components/Setting/Aws.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { AwsSettingService, useAdminAwsSettingState } from '../../services/Setting/AwsSettingService' diff --git a/packages/client-core/src/admin/components/Setting/Chargebee.tsx b/packages/client-core/src/admin/components/Setting/Chargebee.tsx index df2f16cba3..710ffab89c 100644 --- a/packages/client-core/src/admin/components/Setting/Chargebee.tsx +++ b/packages/client-core/src/admin/components/Setting/Chargebee.tsx @@ -1,11 +1,11 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { ChargebeeSettingService, useAdminChargebeeSettingState } from '../../services/Setting/ChargebeeSettingService' diff --git a/packages/client-core/src/admin/components/Setting/Client.tsx b/packages/client-core/src/admin/components/Setting/Client.tsx index 6a9ddb805c..536cde44d7 100644 --- a/packages/client-core/src/admin/components/Setting/Client.tsx +++ b/packages/client-core/src/admin/components/Setting/Client.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Tooltip from '@xrengine/ui/src/Tooltip' -import Typography from '@xrengine/ui/src/Typography' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Tooltip from '@etherealengine/ui/src/Tooltip' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { ClientSettingService, useClientSettingState } from '../../services/Setting/ClientSettingService' diff --git a/packages/client-core/src/admin/components/Setting/ClientTheme/ColorSelectionArea.tsx b/packages/client-core/src/admin/components/Setting/ClientTheme/ColorSelectionArea.tsx index 0c17cf9671..927c7b7b92 100644 --- a/packages/client-core/src/admin/components/Setting/ClientTheme/ColorSelectionArea.tsx +++ b/packages/client-core/src/admin/components/Setting/ClientTheme/ColorSelectionArea.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import InputRadio from '@xrengine/client-core/src/common/components/InputRadio' -import { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import { ThemeOptions } from '@xrengine/common/src/interfaces/ClientSetting' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import Divider from '@xrengine/ui/src/Divider' -import Grid from '@xrengine/ui/src/Grid' +import InputRadio from '@etherealengine/client-core/src/common/components/InputRadio' +import { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import { ThemeOptions } from '@etherealengine/common/src/interfaces/ClientSetting' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import Divider from '@etherealengine/ui/src/Divider' +import Grid from '@etherealengine/ui/src/Grid' import SketchColorPicker from '../../../common/SketchColorPicker' import styles from '../../../styles/settings.module.scss' diff --git a/packages/client-core/src/admin/components/Setting/ClientTheme/DemoStyle.tsx b/packages/client-core/src/admin/components/Setting/ClientTheme/DemoStyle.tsx index fcfa31cefb..ebd2a6f4ee 100644 --- a/packages/client-core/src/admin/components/Setting/ClientTheme/DemoStyle.tsx +++ b/packages/client-core/src/admin/components/Setting/ClientTheme/DemoStyle.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { ThemeOptions } from '@xrengine/common/src/interfaces/ClientSetting' +import { ThemeOptions } from '@etherealengine/common/src/interfaces/ClientSetting' interface DemoStyleProps { theme: ThemeOptions diff --git a/packages/client-core/src/admin/components/Setting/ClientTheme/ThemePlayground.tsx b/packages/client-core/src/admin/components/Setting/ClientTheme/ThemePlayground.tsx index c5f79a9bf7..0fa2e41912 100644 --- a/packages/client-core/src/admin/components/Setting/ClientTheme/ThemePlayground.tsx +++ b/packages/client-core/src/admin/components/Setting/ClientTheme/ThemePlayground.tsx @@ -1,28 +1,28 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Dialog from '@xrengine/ui/src/Dialog' -import Divider from '@xrengine/ui/src/Divider' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import InputBase from '@xrengine/ui/src/InputBase' -import List from '@xrengine/ui/src/List' -import ListItem from '@xrengine/ui/src/ListItem' -import ListItemText from '@xrengine/ui/src/ListItemText' -import Menu from '@xrengine/ui/src/Menu' -import MenuItem from '@xrengine/ui/src/MenuItem' -import Select from '@xrengine/ui/src/Select' -import Table from '@xrengine/ui/src/Table' -import TableBody from '@xrengine/ui/src/TableBody' -import TableCell from '@xrengine/ui/src/TableCell' -import TableContainer from '@xrengine/ui/src/TableContainer' -import TableHead from '@xrengine/ui/src/TableHead' -import TablePagination from '@xrengine/ui/src/TablePagination' -import TableRow from '@xrengine/ui/src/TableRow' -import Typography from '@xrengine/ui/src/Typography' +import { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Dialog from '@etherealengine/ui/src/Dialog' +import Divider from '@etherealengine/ui/src/Divider' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import InputBase from '@etherealengine/ui/src/InputBase' +import List from '@etherealengine/ui/src/List' +import ListItem from '@etherealengine/ui/src/ListItem' +import ListItemText from '@etherealengine/ui/src/ListItemText' +import Menu from '@etherealengine/ui/src/Menu' +import MenuItem from '@etherealengine/ui/src/MenuItem' +import Select from '@etherealengine/ui/src/Select' +import Table from '@etherealengine/ui/src/Table' +import TableBody from '@etherealengine/ui/src/TableBody' +import TableCell from '@etherealengine/ui/src/TableCell' +import TableContainer from '@etherealengine/ui/src/TableContainer' +import TableHead from '@etherealengine/ui/src/TableHead' +import TablePagination from '@etherealengine/ui/src/TablePagination' +import TableRow from '@etherealengine/ui/src/TableRow' +import Typography from '@etherealengine/ui/src/Typography' import DrawerView from '../../../common/DrawerView' import styles from '../../../styles/settings.module.scss' @@ -150,7 +150,7 @@ const ThemePlayground = () => { {t('admin:components.setting.themePlayground')}
diff --git a/packages/client-core/src/admin/components/Setting/ClientTheme/ThemeSelectionArea.tsx b/packages/client-core/src/admin/components/Setting/ClientTheme/ThemeSelectionArea.tsx index f22317163d..93a3d0e5d5 100644 --- a/packages/client-core/src/admin/components/Setting/ClientTheme/ThemeSelectionArea.tsx +++ b/packages/client-core/src/admin/components/Setting/ClientTheme/ThemeSelectionArea.tsx @@ -1,11 +1,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import { ThemeMode } from '@xrengine/common/src/interfaces/ClientSetting' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import { ThemeMode } from '@etherealengine/common/src/interfaces/ClientSetting' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import styles from '../../../styles/settings.module.scss' diff --git a/packages/client-core/src/admin/components/Setting/ClientTheme/index.tsx b/packages/client-core/src/admin/components/Setting/ClientTheme/index.tsx index 681ecbc8e4..50488a5487 100644 --- a/packages/client-core/src/admin/components/Setting/ClientTheme/index.tsx +++ b/packages/client-core/src/admin/components/Setting/ClientTheme/index.tsx @@ -5,9 +5,9 @@ import { defaultThemeModes, defaultThemeSettings, getCurrentTheme -} from '@xrengine/common/src/constants/DefaultThemeSettings' -import { ThemeMode, ThemeSetting } from '@xrengine/common/src/interfaces/ClientSetting' -import Button from '@xrengine/ui/src/Button' +} from '@etherealengine/common/src/constants/DefaultThemeSettings' +import { ThemeMode, ThemeSetting } from '@etherealengine/common/src/interfaces/ClientSetting' +import Button from '@etherealengine/ui/src/Button' import { useAuthState } from '../../../../user/services/AuthService' import { ClientSettingService, useClientSettingState } from '../../../services/Setting/ClientSettingService' diff --git a/packages/client-core/src/admin/components/Setting/Coil.tsx b/packages/client-core/src/admin/components/Setting/Coil.tsx index 51f6eb154b..1d483d0306 100644 --- a/packages/client-core/src/admin/components/Setting/Coil.tsx +++ b/packages/client-core/src/admin/components/Setting/Coil.tsx @@ -1,10 +1,10 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { AdminCoilSettingService, useCoilSettingState } from '../../services/Setting/CoilSettingService' diff --git a/packages/client-core/src/admin/components/Setting/Email.tsx b/packages/client-core/src/admin/components/Setting/Email.tsx index 1858ebb3fc..b9beda38d2 100644 --- a/packages/client-core/src/admin/components/Setting/Email.tsx +++ b/packages/client-core/src/admin/components/Setting/Email.tsx @@ -2,13 +2,13 @@ import { Icon } from '@iconify/react' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import IconButton from '@xrengine/ui/src/IconButton' -import Typography from '@xrengine/ui/src/Typography' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import IconButton from '@etherealengine/ui/src/IconButton' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { EmailSettingService, useEmailSettingState } from '../../services/Setting/EmailSettingService' diff --git a/packages/client-core/src/admin/components/Setting/InstanceServer.tsx b/packages/client-core/src/admin/components/Setting/InstanceServer.tsx index fa7a7058c0..88e4945f3d 100644 --- a/packages/client-core/src/admin/components/Setting/InstanceServer.tsx +++ b/packages/client-core/src/admin/components/Setting/InstanceServer.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { InstanceServerSettingService } from '../../services/Setting/InstanceServerSettingService' diff --git a/packages/client-core/src/admin/components/Setting/Project.tsx b/packages/client-core/src/admin/components/Setting/Project.tsx index c5e23f970f..38cb0ae50b 100644 --- a/packages/client-core/src/admin/components/Setting/Project.tsx +++ b/packages/client-core/src/admin/components/Setting/Project.tsx @@ -1,13 +1,13 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { loadConfigForProject } from '@xrengine/projects/loadConfigForProject' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { loadConfigForProject } from '@etherealengine/projects/loadConfigForProject' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { ProjectService, useProjectState } from '../../../common/services/ProjectService' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/admin/components/Setting/Redis.tsx b/packages/client-core/src/admin/components/Setting/Redis.tsx index 26df883a95..22b9d05b32 100644 --- a/packages/client-core/src/admin/components/Setting/Redis.tsx +++ b/packages/client-core/src/admin/components/Setting/Redis.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { useAdminRedisSettingState } from '../../services/Setting/AdminRedisSettingService' diff --git a/packages/client-core/src/admin/components/Setting/Server.tsx b/packages/client-core/src/admin/components/Setting/Server.tsx index f4f96676c4..825f5fbf0c 100644 --- a/packages/client-core/src/admin/components/Setting/Server.tsx +++ b/packages/client-core/src/admin/components/Setting/Server.tsx @@ -2,13 +2,13 @@ import { Icon } from '@iconify/react' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { useHookstate } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { useHookstate } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { ServerSettingService, useServerSettingState } from '../../services/Setting/ServerSettingService' diff --git a/packages/client-core/src/admin/components/Setting/TaskServer.tsx b/packages/client-core/src/admin/components/Setting/TaskServer.tsx index 14701f2f21..9321990c97 100644 --- a/packages/client-core/src/admin/components/Setting/TaskServer.tsx +++ b/packages/client-core/src/admin/components/Setting/TaskServer.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Box from '@xrengine/ui/src/Box' -import Grid from '@xrengine/ui/src/Grid' -import Typography from '@xrengine/ui/src/Typography' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Box from '@etherealengine/ui/src/Box' +import Grid from '@etherealengine/ui/src/Grid' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthState } from '../../../user/services/AuthService' import { diff --git a/packages/client-core/src/admin/components/Setting/index.tsx b/packages/client-core/src/admin/components/Setting/index.tsx index d4f3c4e5b3..a9a337a4e4 100644 --- a/packages/client-core/src/admin/components/Setting/index.tsx +++ b/packages/client-core/src/admin/components/Setting/index.tsx @@ -2,17 +2,17 @@ import { Icon as Iconify } from '@iconify/react' import React, { Fragment, useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import Avatar from '@xrengine/ui/src/Avatar' -import Button from '@xrengine/ui/src/Button' -import Divider from '@xrengine/ui/src/Divider' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import List from '@xrengine/ui/src/List' -import ListItem from '@xrengine/ui/src/ListItem' -import ListItemAvatar from '@xrengine/ui/src/ListItemAvatar' -import ListItemText from '@xrengine/ui/src/ListItemText' -import Typography from '@xrengine/ui/src/Typography' +import Avatar from '@etherealengine/ui/src/Avatar' +import Button from '@etherealengine/ui/src/Button' +import Divider from '@etherealengine/ui/src/Divider' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import List from '@etherealengine/ui/src/List' +import ListItem from '@etherealengine/ui/src/ListItem' +import ListItemAvatar from '@etherealengine/ui/src/ListItemAvatar' +import ListItemText from '@etherealengine/ui/src/ListItemText' +import Typography from '@etherealengine/ui/src/Typography' import styles from '../../styles/settings.module.scss' import Authentication from './Authentication' diff --git a/packages/client-core/src/admin/components/Users/UserDrawer.tsx b/packages/client-core/src/admin/components/Users/UserDrawer.tsx index 7bfc5c8752..d76827b7b0 100644 --- a/packages/client-core/src/admin/components/Users/UserDrawer.tsx +++ b/packages/client-core/src/admin/components/Users/UserDrawer.tsx @@ -1,21 +1,21 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import AutoComplete, { AutoCompleteData } from '@xrengine/client-core/src/common/components/AutoComplete' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import { AdminScopeType } from '@xrengine/common/src/interfaces/AdminScopeType' -import { CreateEditUser, UserInterface } from '@xrengine/common/src/interfaces/User' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import Container from '@xrengine/ui/src/Container' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import Tooltip from '@xrengine/ui/src/Tooltip' -import Typography from '@xrengine/ui/src/Typography' +import AutoComplete, { AutoCompleteData } from '@etherealengine/client-core/src/common/components/AutoComplete' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import { AdminScopeType } from '@etherealengine/common/src/interfaces/AdminScopeType' +import { CreateEditUser, UserInterface } from '@etherealengine/common/src/interfaces/User' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import Container from '@etherealengine/ui/src/Container' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import Tooltip from '@etherealengine/ui/src/Tooltip' +import Typography from '@etherealengine/ui/src/Typography' import { DiscordIcon } from '../../../common/components/Icons/DiscordIcon' import { FacebookIcon } from '../../../common/components/Icons/FacebookIcon' diff --git a/packages/client-core/src/admin/components/Users/UserTable.tsx b/packages/client-core/src/admin/components/Users/UserTable.tsx index ee244f8dfb..0c812770b7 100644 --- a/packages/client-core/src/admin/components/Users/UserTable.tsx +++ b/packages/client-core/src/admin/components/Users/UserTable.tsx @@ -1,12 +1,12 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { IdentityProvider } from '@xrengine/common/src/interfaces/IdentityProvider' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' -import Tooltip from '@xrengine/ui/src/Tooltip' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { IdentityProvider } from '@etherealengine/common/src/interfaces/IdentityProvider' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' +import Tooltip from '@etherealengine/ui/src/Tooltip' import { DiscordIcon } from '../../../common/components/Icons/DiscordIcon' import { FacebookIcon } from '../../../common/components/Icons/FacebookIcon' diff --git a/packages/client-core/src/admin/components/Users/index.tsx b/packages/client-core/src/admin/components/Users/index.tsx index 5118c6adc3..90a4836dc2 100644 --- a/packages/client-core/src/admin/components/Users/index.tsx +++ b/packages/client-core/src/admin/components/Users/index.tsx @@ -1,14 +1,14 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Popover from '@xrengine/ui/src/Popover' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Popover from '@etherealengine/ui/src/Popover' import Search from '../../common/Search' import { AdminUserService } from '../../services/UserService' diff --git a/packages/client-core/src/admin/services/ActiveRouteService.ts b/packages/client-core/src/admin/services/ActiveRouteService.ts index b57dc67af4..49fe478940 100644 --- a/packages/client-core/src/admin/services/ActiveRouteService.ts +++ b/packages/client-core/src/admin/services/ActiveRouteService.ts @@ -1,6 +1,6 @@ -import { ActiveRoutesInterface } from '@xrengine/common/src/interfaces/Route' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { ActiveRoutesInterface } from '@etherealengine/common/src/interfaces/Route' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/AnalyticsService.ts b/packages/client-core/src/admin/services/AnalyticsService.ts index 415d9b27ba..5b71db47a1 100644 --- a/packages/client-core/src/admin/services/AnalyticsService.ts +++ b/packages/client-core/src/admin/services/AnalyticsService.ts @@ -1,7 +1,7 @@ -import { AdminAnalytics, AdminAnalyticsResult } from '@xrengine/common/src/interfaces/AdminAnalyticsData' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { AdminAnalytics, AdminAnalyticsResult } from '@etherealengine/common/src/interfaces/AdminAnalyticsData' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/admin/services/AvatarService.ts b/packages/client-core/src/admin/services/AvatarService.ts index a9a12068df..c7ad667e62 100644 --- a/packages/client-core/src/admin/services/AvatarService.ts +++ b/packages/client-core/src/admin/services/AvatarService.ts @@ -1,11 +1,11 @@ import { Paginated } from '@feathersjs/feathers' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { AvatarResult } from '@xrengine/common/src/interfaces/AvatarResult' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { AvatarResult } from '@etherealengine/common/src/interfaces/AvatarResult' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/admin/services/BotsCommand.ts b/packages/client-core/src/admin/services/BotsCommand.ts index 18a8a8f4d4..08e454769e 100644 --- a/packages/client-core/src/admin/services/BotsCommand.ts +++ b/packages/client-core/src/admin/services/BotsCommand.ts @@ -1,7 +1,7 @@ -import { BotCommands, CreateBotCammand } from '@xrengine/common/src/interfaces/AdminBot' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { BotCommands, CreateBotCammand } from '@etherealengine/common/src/interfaces/AdminBot' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/admin/services/BotsService.ts b/packages/client-core/src/admin/services/BotsService.ts index 657ce4e951..bbf3cfb7e1 100644 --- a/packages/client-core/src/admin/services/BotsService.ts +++ b/packages/client-core/src/admin/services/BotsService.ts @@ -1,9 +1,9 @@ import { Paginated } from '@feathersjs/feathers' -import { AdminBot, CreateBotAsAdmin } from '@xrengine/common/src/interfaces/AdminBot' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { AdminBot, CreateBotAsAdmin } from '@etherealengine/common/src/interfaces/AdminBot' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { accessAuthState } from '../../user/services/AuthService' diff --git a/packages/client-core/src/admin/services/BuildStatusService.ts b/packages/client-core/src/admin/services/BuildStatusService.ts index fdf78671db..bbcc2e2767 100644 --- a/packages/client-core/src/admin/services/BuildStatusService.ts +++ b/packages/client-core/src/admin/services/BuildStatusService.ts @@ -1,10 +1,10 @@ import { Paginated } from '@feathersjs/feathers' -import { BuildStatus } from '@xrengine/common/src/interfaces/BuildStatus' -import { BuildStatusResult } from '@xrengine/common/src/interfaces/BuildStatusResult' -import { Invite } from '@xrengine/common/src/interfaces/Invite' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { BuildStatus } from '@etherealengine/common/src/interfaces/BuildStatus' +import { BuildStatusResult } from '@etherealengine/common/src/interfaces/BuildStatusResult' +import { Invite } from '@etherealengine/common/src/interfaces/Invite' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/GroupService.ts b/packages/client-core/src/admin/services/GroupService.ts index 0ad9f1e9ed..afbaa18278 100644 --- a/packages/client-core/src/admin/services/GroupService.ts +++ b/packages/client-core/src/admin/services/GroupService.ts @@ -1,7 +1,7 @@ -import { CreateGroup, Group } from '@xrengine/common/src/interfaces/Group' -import { GroupResult } from '@xrengine/common/src/interfaces/GroupResult' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { CreateGroup, Group } from '@etherealengine/common/src/interfaces/Group' +import { GroupResult } from '@etherealengine/common/src/interfaces/GroupResult' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/InstanceService.ts b/packages/client-core/src/admin/services/InstanceService.ts index 00c440663d..6be1420b19 100644 --- a/packages/client-core/src/admin/services/InstanceService.ts +++ b/packages/client-core/src/admin/services/InstanceService.ts @@ -2,9 +2,9 @@ import { Paginated } from '@feathersjs/feathers' import { useState } from '@hookstate/core' import { useEffect } from 'react' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState } from '@xrengine/hyperflux' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/InstanceserverService.ts b/packages/client-core/src/admin/services/InstanceserverService.ts index ed19a5f202..405c8ac1eb 100644 --- a/packages/client-core/src/admin/services/InstanceserverService.ts +++ b/packages/client-core/src/admin/services/InstanceserverService.ts @@ -1,7 +1,7 @@ -import { InstanceServerPatch } from '@xrengine/common/src/interfaces/Instance' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { InstanceServerPatch } from '@etherealengine/common/src/interfaces/Instance' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/admin/services/InviteService.ts b/packages/client-core/src/admin/services/InviteService.ts index 583d5c3f17..c487a3f070 100644 --- a/packages/client-core/src/admin/services/InviteService.ts +++ b/packages/client-core/src/admin/services/InviteService.ts @@ -1,10 +1,10 @@ import { Paginated } from '@feathersjs/feathers' -import { Invite as InviteInterface } from '@xrengine/common/src/interfaces/Invite' -import { Invite as InviteType } from '@xrengine/common/src/interfaces/Invite' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Invite as InviteInterface } from '@etherealengine/common/src/interfaces/Invite' +import { Invite as InviteType } from '@etherealengine/common/src/interfaces/Invite' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/LocationService.ts b/packages/client-core/src/admin/services/LocationService.ts index 312c34fdbd..70bc172002 100644 --- a/packages/client-core/src/admin/services/LocationService.ts +++ b/packages/client-core/src/admin/services/LocationService.ts @@ -1,10 +1,10 @@ import { Paginated } from '@feathersjs/feathers' -import { Location } from '@xrengine/common/src/interfaces/Location' -import { LocationType } from '@xrengine/common/src/interfaces/LocationType' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Location } from '@etherealengine/common/src/interfaces/Location' +import { LocationType } from '@etherealengine/common/src/interfaces/LocationType' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/PartyService.ts b/packages/client-core/src/admin/services/PartyService.ts index fd6eaa4118..d022f3c837 100644 --- a/packages/client-core/src/admin/services/PartyService.ts +++ b/packages/client-core/src/admin/services/PartyService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { Party, PatchParty } from '@xrengine/common/src/interfaces/Party' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Party, PatchParty } from '@etherealengine/common/src/interfaces/Party' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/ProjectUpdateService.ts b/packages/client-core/src/admin/services/ProjectUpdateService.ts index d8d4c50bca..3b42dcfdfa 100644 --- a/packages/client-core/src/admin/services/ProjectUpdateService.ts +++ b/packages/client-core/src/admin/services/ProjectUpdateService.ts @@ -1,14 +1,14 @@ import { none } from '@hookstate/core' -import { ProjectBranchInterface } from '@xrengine/common/src/interfaces/ProjectBranchInterface' -import { ProjectCommitInterface } from '@xrengine/common/src/interfaces/ProjectCommitInterface' +import { ProjectBranchInterface } from '@etherealengine/common/src/interfaces/ProjectBranchInterface' +import { ProjectCommitInterface } from '@etherealengine/common/src/interfaces/ProjectCommitInterface' import { DefaultUpdateSchedule, ProjectInterface, ProjectUpdateType -} from '@xrengine/common/src/interfaces/ProjectInterface' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +} from '@etherealengine/common/src/interfaces/ProjectInterface' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' const ProjectUpdateState = defineState({ name: 'ProjectUpdateState', diff --git a/packages/client-core/src/admin/services/ResourceService.ts b/packages/client-core/src/admin/services/ResourceService.ts index 94804515b4..c04985eb5f 100644 --- a/packages/client-core/src/admin/services/ResourceService.ts +++ b/packages/client-core/src/admin/services/ResourceService.ts @@ -1,10 +1,13 @@ import { Paginated } from '@feathersjs/feathers/lib' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' -import { StaticResourceFilterResult, StaticResourceResult } from '@xrengine/common/src/interfaces/StaticResourceResult' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' +import { + StaticResourceFilterResult, + StaticResourceResult +} from '@etherealengine/common/src/interfaces/StaticResourceResult' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/RouteService.ts b/packages/client-core/src/admin/services/RouteService.ts index 45365741e3..8fa721aa1a 100644 --- a/packages/client-core/src/admin/services/RouteService.ts +++ b/packages/client-core/src/admin/services/RouteService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { InstalledRoutesInterface } from '@xrengine/common/src/interfaces/Route' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { InstalledRoutesInterface } from '@etherealengine/common/src/interfaces/Route' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/SceneService.ts b/packages/client-core/src/admin/services/SceneService.ts index 27e3ef25ca..67823f6ade 100644 --- a/packages/client-core/src/admin/services/SceneService.ts +++ b/packages/client-core/src/admin/services/SceneService.ts @@ -1,6 +1,6 @@ -import { SceneData, SceneMetadata } from '@xrengine/common/src/interfaces/SceneInterface' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { SceneData, SceneMetadata } from '@etherealengine/common/src/interfaces/SceneInterface' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/admin/services/ScopeTypeService.ts b/packages/client-core/src/admin/services/ScopeTypeService.ts index 64b92fec5b..80b094a5ab 100644 --- a/packages/client-core/src/admin/services/ScopeTypeService.ts +++ b/packages/client-core/src/admin/services/ScopeTypeService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { AdminScopeType } from '@xrengine/common/src/interfaces/AdminScopeType' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { AdminScopeType } from '@etherealengine/common/src/interfaces/AdminScopeType' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/ServerInfoService.ts b/packages/client-core/src/admin/services/ServerInfoService.ts index 0a985ed8bf..0ebce0f4d5 100644 --- a/packages/client-core/src/admin/services/ServerInfoService.ts +++ b/packages/client-core/src/admin/services/ServerInfoService.ts @@ -1,6 +1,6 @@ -import { ServerInfoInterface, ServerPodInfo } from '@xrengine/common/src/interfaces/ServerInfo' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { ServerInfoInterface, ServerPodInfo } from '@etherealengine/common/src/interfaces/ServerInfo' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/ServerLogsService.ts b/packages/client-core/src/admin/services/ServerLogsService.ts index 89e1e94a00..bb2939b204 100644 --- a/packages/client-core/src/admin/services/ServerLogsService.ts +++ b/packages/client-core/src/admin/services/ServerLogsService.ts @@ -1,5 +1,5 @@ -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/AdminRedisSettingService.ts b/packages/client-core/src/admin/services/Setting/AdminRedisSettingService.ts index 732899a1a7..de664aa232 100644 --- a/packages/client-core/src/admin/services/Setting/AdminRedisSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/AdminRedisSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { AdminRedisSetting } from '@xrengine/common/src/interfaces/AdminRedisSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { AdminRedisSetting } from '@etherealengine/common/src/interfaces/AdminRedisSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/AuthSettingService.ts b/packages/client-core/src/admin/services/Setting/AuthSettingService.ts index e6d03c010e..808001ce5a 100644 --- a/packages/client-core/src/admin/services/Setting/AuthSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/AuthSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { AdminAuthSetting, PatchAuthSetting } from '@xrengine/common/src/interfaces/AdminAuthSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { AdminAuthSetting, PatchAuthSetting } from '@etherealengine/common/src/interfaces/AdminAuthSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/AwsSettingService.ts b/packages/client-core/src/admin/services/Setting/AwsSettingService.ts index dcb91f7bd5..0819234921 100644 --- a/packages/client-core/src/admin/services/Setting/AwsSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/AwsSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { AdminAwsSetting, PatchAwsSetting } from '@xrengine/common/src/interfaces/AdminAwsSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { AdminAwsSetting, PatchAwsSetting } from '@etherealengine/common/src/interfaces/AdminAwsSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/ChargebeeSettingService.ts b/packages/client-core/src/admin/services/Setting/ChargebeeSettingService.ts index a68c6ae6c0..6d7fc1835c 100644 --- a/packages/client-core/src/admin/services/Setting/ChargebeeSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/ChargebeeSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { ChargebeeSetting } from '@xrengine/common/src/interfaces/ChargebeeSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { ChargebeeSetting } from '@etherealengine/common/src/interfaces/ChargebeeSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/ClientSettingService.ts b/packages/client-core/src/admin/services/Setting/ClientSettingService.ts index aaa74a4d43..aecebe6b3e 100644 --- a/packages/client-core/src/admin/services/Setting/ClientSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/ClientSettingService.ts @@ -1,10 +1,10 @@ import { Paginated } from '@feathersjs/feathers' -import config from '@xrengine/common/src/config' -import { ClientSetting, PatchClientSetting } from '@xrengine/common/src/interfaces/ClientSetting' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import config from '@etherealengine/common/src/config' +import { ClientSetting, PatchClientSetting } from '@etherealengine/common/src/interfaces/ClientSetting' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/CoilSettingService.ts b/packages/client-core/src/admin/services/Setting/CoilSettingService.ts index 56517e8781..f445b0f7cc 100644 --- a/packages/client-core/src/admin/services/Setting/CoilSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/CoilSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { CoilSetting } from '@xrengine/common/src/interfaces/CoilSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { CoilSetting } from '@etherealengine/common/src/interfaces/CoilSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/EmailSettingService.ts b/packages/client-core/src/admin/services/Setting/EmailSettingService.ts index 2f3dbebecc..b1989d6c59 100644 --- a/packages/client-core/src/admin/services/Setting/EmailSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/EmailSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { EmailSetting, PatchEmailSetting } from '@xrengine/common/src/interfaces/EmailSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { EmailSetting, PatchEmailSetting } from '@etherealengine/common/src/interfaces/EmailSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/InstanceServerSettingService.ts b/packages/client-core/src/admin/services/Setting/InstanceServerSettingService.ts index 7fe4c692c2..899c06a9c1 100644 --- a/packages/client-core/src/admin/services/Setting/InstanceServerSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/InstanceServerSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { InstanceServerSetting } from '@xrengine/common/src/interfaces/InstanceServerSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { InstanceServerSetting } from '@etherealengine/common/src/interfaces/InstanceServerSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/ProjectSettingService.ts b/packages/client-core/src/admin/services/Setting/ProjectSettingService.ts index b699cf6170..07bc1a5b52 100644 --- a/packages/client-core/src/admin/services/Setting/ProjectSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/ProjectSettingService.ts @@ -1,5 +1,5 @@ -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' diff --git a/packages/client-core/src/admin/services/Setting/ServerSettingService.ts b/packages/client-core/src/admin/services/Setting/ServerSettingService.ts index 8882ac84cc..c6206dbf85 100644 --- a/packages/client-core/src/admin/services/Setting/ServerSettingService.ts +++ b/packages/client-core/src/admin/services/Setting/ServerSettingService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { PatchServerSetting, ServerSetting } from '@xrengine/common/src/interfaces/ServerSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { PatchServerSetting, ServerSetting } from '@etherealengine/common/src/interfaces/ServerSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/Setting/TaskServerSettingsService.ts b/packages/client-core/src/admin/services/Setting/TaskServerSettingsService.ts index c826fb97f1..19c0ec6e40 100644 --- a/packages/client-core/src/admin/services/Setting/TaskServerSettingsService.ts +++ b/packages/client-core/src/admin/services/Setting/TaskServerSettingsService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { TaskServerSetting } from '@xrengine/common/src/interfaces/TaskServerSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { TaskServerSetting } from '@etherealengine/common/src/interfaces/TaskServerSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../../API' import { NotificationService } from '../../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/services/TestBotService.ts b/packages/client-core/src/admin/services/TestBotService.ts index ed0edc1441..0c0a9999af 100644 --- a/packages/client-core/src/admin/services/TestBotService.ts +++ b/packages/client-core/src/admin/services/TestBotService.ts @@ -1,7 +1,7 @@ -import { SpawnTestBot, TestBot } from '@xrengine/common/src/interfaces/TestBot' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { SpawnTestBot, TestBot } from '@etherealengine/common/src/interfaces/TestBot' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/admin/services/UserService.ts b/packages/client-core/src/admin/services/UserService.ts index f6b68213ba..5eb6964dfb 100644 --- a/packages/client-core/src/admin/services/UserService.ts +++ b/packages/client-core/src/admin/services/UserService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers' -import { CreateEditUser, UserInterface, UserSeed } from '@xrengine/common/src/interfaces/User' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { CreateEditUser, UserInterface, UserSeed } from '@etherealengine/common/src/interfaces/User' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/admin/styles/admin.module.scss b/packages/client-core/src/admin/styles/admin.module.scss index ce98bd42a1..393c7bdeb4 100644 --- a/packages/client-core/src/admin/styles/admin.module.scss +++ b/packages/client-core/src/admin/styles/admin.module.scss @@ -1,4 +1,4 @@ -@import "@xrengine/client-core/src/styles/imports.module.scss"; +@import "@etherealengine/client-core/src/styles/imports.module.scss"; .openModalBtn { height: 50px; @@ -505,7 +505,7 @@ /** * This below style is added to fix background issues with chrome autofill. - * https://github.com/XRFoundation/XREngine/pull/6448#pullrequestreview-1018811200 + * https://github.com/etherealengine/etherealengine/pull/6448#pullrequestreview-1018811200 * https://stackoverflow.com/a/14205976/2077741 */ input:-webkit-autofill, diff --git a/packages/client-core/src/common/analytics.tsx b/packages/client-core/src/common/analytics.tsx index db71685715..f85b1bc2a5 100755 --- a/packages/client-core/src/common/analytics.tsx +++ b/packages/client-core/src/common/analytics.tsx @@ -1,6 +1,6 @@ import ReactGA from 'react-ga4' -import config from '@xrengine/common/src/config' +import config from '@etherealengine/common/src/config' export const initGA = () => { if (config.client.gaMeasurementId && config.client.gaMeasurementId.length > 0) diff --git a/packages/client-core/src/common/components/AutoComplete/index.tsx b/packages/client-core/src/common/components/AutoComplete/index.tsx index 9906879777..492f728064 100644 --- a/packages/client-core/src/common/components/AutoComplete/index.tsx +++ b/packages/client-core/src/common/components/AutoComplete/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import Icon from '@xrengine/ui/src/Icon' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import Icon from '@etherealengine/ui/src/Icon' import { AutocompleteGetTagProps, useAutocomplete } from '@mui/base/AutocompleteUnstyled' diff --git a/packages/client-core/src/common/components/AutoCompleteSingle/index.tsx b/packages/client-core/src/common/components/AutoCompleteSingle/index.tsx index 117d758148..f44dabb4a1 100644 --- a/packages/client-core/src/common/components/AutoCompleteSingle/index.tsx +++ b/packages/client-core/src/common/components/AutoCompleteSingle/index.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import FormControl from '@xrengine/ui/src/FormControl' -import FormHelperText from '@xrengine/ui/src/FormHelperText' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import FormControl from '@etherealengine/ui/src/FormControl' +import FormHelperText from '@etherealengine/ui/src/FormHelperText' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { useAutocomplete } from '@mui/base/AutocompleteUnstyled' diff --git a/packages/client-core/src/common/components/Avatar/index.tsx b/packages/client-core/src/common/components/Avatar/index.tsx index 7712570bf1..1edfd0b644 100644 --- a/packages/client-core/src/common/components/Avatar/index.tsx +++ b/packages/client-core/src/common/components/Avatar/index.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import commonStyles from '@xrengine/client-core/src/common/components/common.module.scss' -import Text from '@xrengine/client-core/src/common/components/Text' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Paper from '@xrengine/ui/src/Paper' +import commonStyles from '@etherealengine/client-core/src/common/components/common.module.scss' +import Text from '@etherealengine/client-core/src/common/components/Text' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Paper from '@etherealengine/ui/src/Paper' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/AvatarPreview/index.tsx b/packages/client-core/src/common/components/AvatarPreview/index.tsx index efdaafc9c1..9e8d459350 100644 --- a/packages/client-core/src/common/components/AvatarPreview/index.tsx +++ b/packages/client-core/src/common/components/AvatarPreview/index.tsx @@ -1,20 +1,20 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import commonStyles from '@xrengine/client-core/src/common/components/common.module.scss' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import Text from '@xrengine/client-core/src/common/components/Text' +import commonStyles from '@etherealengine/client-core/src/common/components/common.module.scss' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import Text from '@etherealengine/client-core/src/common/components/Text' import { loadAvatarForPreview, resetAnimationLogic, validate -} from '@xrengine/client-core/src/user/components/Panel3D/helperFunctions' -import { useRender3DPanelSystem } from '@xrengine/client-core/src/user/components/Panel3D/useRender3DPanelSystem' -import { AvatarRigComponent } from '@xrengine/engine/src/avatar/components/AvatarAnimationComponent' -import { getOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' -import Tooltip from '@xrengine/ui/src/Tooltip' +} from '@etherealengine/client-core/src/user/components/Panel3D/helperFunctions' +import { useRender3DPanelSystem } from '@etherealengine/client-core/src/user/components/Panel3D/useRender3DPanelSystem' +import { AvatarRigComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent' +import { getOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' +import Tooltip from '@etherealengine/ui/src/Tooltip' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/Button/index.tsx b/packages/client-core/src/common/components/Button/index.tsx index 4b8c7ce00b..8a235a5bdd 100644 --- a/packages/client-core/src/common/components/Button/index.tsx +++ b/packages/client-core/src/common/components/Button/index.tsx @@ -1,10 +1,10 @@ import React from 'react' -import Text from '@xrengine/client-core/src/common/components/Text' -import Box from '@xrengine/ui/src/Box' -import { default as MUIButton } from '@xrengine/ui/src/Button' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import Text from '@etherealengine/client-core/src/common/components/Text' +import Box from '@etherealengine/ui/src/Box' +import { default as MUIButton } from '@etherealengine/ui/src/Button' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/ConfirmDialog/index.tsx b/packages/client-core/src/common/components/ConfirmDialog/index.tsx index a78f7c8745..b1c676c613 100644 --- a/packages/client-core/src/common/components/ConfirmDialog/index.tsx +++ b/packages/client-core/src/common/components/ConfirmDialog/index.tsx @@ -1,13 +1,13 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/client-core/src/common/components/Button' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import Dialog from '@xrengine/ui/src/Dialog' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogContent from '@xrengine/ui/src/DialogContent' -import DialogContentText from '@xrengine/ui/src/DialogContentText' -import DialogTitle from '@xrengine/ui/src/DialogTitle' +import Button from '@etherealengine/client-core/src/common/components/Button' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import Dialog from '@etherealengine/ui/src/Dialog' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogContent from '@etherealengine/ui/src/DialogContent' +import DialogContentText from '@etherealengine/ui/src/DialogContentText' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' import styles from './index.module.scss' diff --git a/packages/client-core/src/common/components/ErrorView/index.tsx b/packages/client-core/src/common/components/ErrorView/index.tsx index 446edef586..970797973d 100644 --- a/packages/client-core/src/common/components/ErrorView/index.tsx +++ b/packages/client-core/src/common/components/ErrorView/index.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/client-core/src/common/components/Button' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' -import Typography from '@xrengine/ui/src/Typography' +import Button from '@etherealengine/client-core/src/common/components/Button' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' +import Typography from '@etherealengine/ui/src/Typography' import { Variant } from '@mui/material/styles/createTypography' diff --git a/packages/client-core/src/common/components/InputCheck/index.tsx b/packages/client-core/src/common/components/InputCheck/index.tsx index da71db2868..e824183517 100644 --- a/packages/client-core/src/common/components/InputCheck/index.tsx +++ b/packages/client-core/src/common/components/InputCheck/index.tsx @@ -1,9 +1,9 @@ import React from 'react' -import Text from '@xrengine/client-core/src/common/components/Text' -import Box from '@xrengine/ui/src/Box' -import Checkbox from '@xrengine/ui/src/Checkbox' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' +import Text from '@etherealengine/client-core/src/common/components/Text' +import Box from '@etherealengine/ui/src/Box' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/InputRadio/index.tsx b/packages/client-core/src/common/components/InputRadio/index.tsx index daa4173b93..6e66f63799 100644 --- a/packages/client-core/src/common/components/InputRadio/index.tsx +++ b/packages/client-core/src/common/components/InputRadio/index.tsx @@ -1,13 +1,13 @@ import React from 'react' -import { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import Box from '@xrengine/ui/src/Box' -import FormControl from '@xrengine/ui/src/FormControl' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import FormHelperText from '@xrengine/ui/src/FormHelperText' -import FormLabel from '@xrengine/ui/src/FormLabel' -import Radio from '@xrengine/ui/src/Radio' -import RadioGroup from '@xrengine/ui/src/RadioGroup' +import { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import Box from '@etherealengine/ui/src/Box' +import FormControl from '@etherealengine/ui/src/FormControl' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import FormHelperText from '@etherealengine/ui/src/FormHelperText' +import FormLabel from '@etherealengine/ui/src/FormLabel' +import Radio from '@etherealengine/ui/src/Radio' +import RadioGroup from '@etherealengine/ui/src/RadioGroup' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/InputSelect/index.tsx b/packages/client-core/src/common/components/InputSelect/index.tsx index 25ac283d19..2aaafd0b41 100644 --- a/packages/client-core/src/common/components/InputSelect/index.tsx +++ b/packages/client-core/src/common/components/InputSelect/index.tsx @@ -1,13 +1,13 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import Box from '@xrengine/ui/src/Box' -import FormControl from '@xrengine/ui/src/FormControl' -import FormHelperText from '@xrengine/ui/src/FormHelperText' -import InputLabel from '@xrengine/ui/src/InputLabel' -import MenuItem from '@xrengine/ui/src/MenuItem' -import Select from '@xrengine/ui/src/Select' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import Box from '@etherealengine/ui/src/Box' +import FormControl from '@etherealengine/ui/src/FormControl' +import FormHelperText from '@etherealengine/ui/src/FormHelperText' +import InputLabel from '@etherealengine/ui/src/InputLabel' +import MenuItem from '@etherealengine/ui/src/MenuItem' +import Select from '@etherealengine/ui/src/Select' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/InputSlider/index.tsx b/packages/client-core/src/common/components/InputSlider/index.tsx index 1b58cebb34..0785988409 100644 --- a/packages/client-core/src/common/components/InputSlider/index.tsx +++ b/packages/client-core/src/common/components/InputSlider/index.tsx @@ -1,8 +1,8 @@ import React from 'react' -import Text from '@xrengine/client-core/src/common/components/Text' -import Box from '@xrengine/ui/src/Box' -import Slider from '@xrengine/ui/src/Slider' +import Text from '@etherealengine/client-core/src/common/components/Text' +import Box from '@etherealengine/ui/src/Box' +import Slider from '@etherealengine/ui/src/Slider' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/InputSwitch/index.tsx b/packages/client-core/src/common/components/InputSwitch/index.tsx index 9a0c045d2a..04d672285a 100644 --- a/packages/client-core/src/common/components/InputSwitch/index.tsx +++ b/packages/client-core/src/common/components/InputSwitch/index.tsx @@ -1,9 +1,9 @@ import React from 'react' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import Box from '@xrengine/ui/src/Box' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import Switch from '@xrengine/ui/src/Switch' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import Box from '@etherealengine/ui/src/Box' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import Switch from '@etherealengine/ui/src/Switch' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/InputText/index.tsx b/packages/client-core/src/common/components/InputText/index.tsx index a910bd0fc9..7ec5d40643 100644 --- a/packages/client-core/src/common/components/InputText/index.tsx +++ b/packages/client-core/src/common/components/InputText/index.tsx @@ -1,13 +1,13 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import Box from '@xrengine/ui/src/Box' -import FormControl from '@xrengine/ui/src/FormControl' -import FormHelperText from '@xrengine/ui/src/FormHelperText' -import IconButton from '@xrengine/ui/src/IconButton' -import InputLabel from '@xrengine/ui/src/InputLabel' -import OutlinedInput from '@xrengine/ui/src/OutlinedInput' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import Box from '@etherealengine/ui/src/Box' +import FormControl from '@etherealengine/ui/src/FormControl' +import FormHelperText from '@etherealengine/ui/src/FormHelperText' +import IconButton from '@etherealengine/ui/src/IconButton' +import InputLabel from '@etherealengine/ui/src/InputLabel' +import OutlinedInput from '@etherealengine/ui/src/OutlinedInput' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/LazyImage/index.tsx b/packages/client-core/src/common/components/LazyImage/index.tsx index a334e30d11..3f7453a25b 100755 --- a/packages/client-core/src/common/components/LazyImage/index.tsx +++ b/packages/client-core/src/common/components/LazyImage/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react' -import CardMedia from '@xrengine/ui/src/CardMedia' -import Icon from '@xrengine/ui/src/Icon' +import CardMedia from '@etherealengine/ui/src/CardMedia' +import Icon from '@etherealengine/ui/src/Icon' import styles from './index.module.scss' diff --git a/packages/client-core/src/common/components/LoadingView/index.tsx b/packages/client-core/src/common/components/LoadingView/index.tsx index ae0f6efd43..eeb8b0f2d1 100644 --- a/packages/client-core/src/common/components/LoadingView/index.tsx +++ b/packages/client-core/src/common/components/LoadingView/index.tsx @@ -1,8 +1,8 @@ import React from 'react' -import Box from '@xrengine/ui/src/Box' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Typography from '@xrengine/ui/src/Typography' +import Box from '@etherealengine/ui/src/Box' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Typography from '@etherealengine/ui/src/Typography' import { SxProps, Theme } from '@mui/material/styles' import { Variant } from '@mui/material/styles/createTypography' diff --git a/packages/client-core/src/common/components/Menu/index.tsx b/packages/client-core/src/common/components/Menu/index.tsx index 046fa5126e..ff0d5c147b 100755 --- a/packages/client-core/src/common/components/Menu/index.tsx +++ b/packages/client-core/src/common/components/Menu/index.tsx @@ -1,15 +1,15 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/client-core/src/common/components/Button' -import Box from '@xrengine/ui/src/Box' -import { default as MUIDialog } from '@xrengine/ui/src/Dialog' -import DialogActions from '@xrengine/ui/src/DialogActions' -import DialogContent from '@xrengine/ui/src/DialogContent' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Typography from '@xrengine/ui/src/Typography' +import Button from '@etherealengine/client-core/src/common/components/Button' +import Box from '@etherealengine/ui/src/Box' +import { default as MUIDialog } from '@etherealengine/ui/src/Dialog' +import DialogActions from '@etherealengine/ui/src/DialogActions' +import DialogContent from '@etherealengine/ui/src/DialogContent' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Typography from '@etherealengine/ui/src/Typography' import { Breakpoint, SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/NotificationActions.tsx b/packages/client-core/src/common/components/NotificationActions.tsx index 1046ab2339..0f208cc3d0 100644 --- a/packages/client-core/src/common/components/NotificationActions.tsx +++ b/packages/client-core/src/common/components/NotificationActions.tsx @@ -2,8 +2,8 @@ import { SnackbarKey, useSnackbar } from 'notistack' import { Fragment } from 'react' import React from 'react' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' export const defaultAction = (key: SnackbarKey, content?: React.ReactNode) => { const { closeSnackbar } = useSnackbar() diff --git a/packages/client-core/src/common/components/Tabs/index.tsx b/packages/client-core/src/common/components/Tabs/index.tsx index 980ce42e6c..e4ec60e689 100644 --- a/packages/client-core/src/common/components/Tabs/index.tsx +++ b/packages/client-core/src/common/components/Tabs/index.tsx @@ -1,7 +1,7 @@ import React from 'react' -import Tab from '@xrengine/ui/src/Tab' -import { default as MUITabs } from '@xrengine/ui/src/Tabs' +import Tab from '@etherealengine/ui/src/Tab' +import { default as MUITabs } from '@etherealengine/ui/src/Tabs' import { SxProps, Theme } from '@mui/material/styles' diff --git a/packages/client-core/src/common/components/Text/index.tsx b/packages/client-core/src/common/components/Text/index.tsx index 051be5c5f0..22c4c0fb5f 100644 --- a/packages/client-core/src/common/components/Text/index.tsx +++ b/packages/client-core/src/common/components/Text/index.tsx @@ -1,6 +1,6 @@ import React from 'react' -import Typography from '@xrengine/ui/src/Typography' +import Typography from '@etherealengine/ui/src/Typography' import { SxProps, Theme } from '@mui/material/styles' import { Variant } from '@mui/material/styles/createTypography' diff --git a/packages/client-core/src/common/components/TouchGamepad/index.tsx b/packages/client-core/src/common/components/TouchGamepad/index.tsx index 0eaccb5700..68d68fc6a4 100755 --- a/packages/client-core/src/common/components/TouchGamepad/index.tsx +++ b/packages/client-core/src/common/components/TouchGamepad/index.tsx @@ -2,12 +2,12 @@ import { useHookstate } from '@hookstate/core' import React from 'react' import { Joystick } from 'react-joystick-component' -import { isTouchAvailable } from '@xrengine/engine/src/common/functions/DetectFeatures' -import { ButtonTypes } from '@xrengine/engine/src/input/InputState' -import { InteractState } from '@xrengine/engine/src/interaction/systems/InteractiveSystem' -import { useIsHeadset } from '@xrengine/engine/src/xr/XRState' -import { getState } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +import { isTouchAvailable } from '@etherealengine/engine/src/common/functions/DetectFeatures' +import { ButtonTypes } from '@etherealengine/engine/src/input/InputState' +import { InteractState } from '@etherealengine/engine/src/interaction/systems/InteractiveSystem' +import { useIsHeadset } from '@etherealengine/engine/src/xr/XRState' +import { getState } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { AppState } from '../../services/AppService' import styles from './index.module.scss' diff --git a/packages/client-core/src/common/components/UIDialog/index.tsx b/packages/client-core/src/common/components/UIDialog/index.tsx index b3a79ffec1..a2f6a9ade2 100755 --- a/packages/client-core/src/common/components/UIDialog/index.tsx +++ b/packages/client-core/src/common/components/UIDialog/index.tsx @@ -1,13 +1,13 @@ import React, { useEffect } from 'react' import { useNavigate } from 'react-router-dom' -import { dispatchAction } from '@xrengine/hyperflux' -import Dialog from '@xrengine/ui/src/Dialog' -import DialogContent from '@xrengine/ui/src/DialogContent' -import DialogTitle from '@xrengine/ui/src/DialogTitle' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Typography from '@xrengine/ui/src/Typography' +import { dispatchAction } from '@etherealengine/hyperflux' +import Dialog from '@etherealengine/ui/src/Dialog' +import DialogContent from '@etherealengine/ui/src/DialogContent' +import DialogTitle from '@etherealengine/ui/src/DialogTitle' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Typography from '@etherealengine/ui/src/Typography' import { useDialogState } from '../../services/DialogService' import { DialogAction } from '../../services/DialogService' diff --git a/packages/client-core/src/common/components/common.module.scss b/packages/client-core/src/common/components/common.module.scss index 0de3110115..1f5068f829 100755 --- a/packages/client-core/src/common/components/common.module.scss +++ b/packages/client-core/src/common/components/common.module.scss @@ -5,7 +5,7 @@ /** * This below style is added to fix background issues with chrome autofill. - * https://github.com/XRFoundation/XREngine/pull/6448#pullrequestreview-1018811200 + * https://github.com/etherealengine/etherealengine/pull/6448#pullrequestreview-1018811200 * https://stackoverflow.com/a/14205976/2077741 */ input:-webkit-autofill, diff --git a/packages/client-core/src/common/services/AppLoadingService.ts b/packages/client-core/src/common/services/AppLoadingService.ts index 3fe208d4af..3ea399f1c4 100755 --- a/packages/client-core/src/common/services/AppLoadingService.ts +++ b/packages/client-core/src/common/services/AppLoadingService.ts @@ -1,5 +1,5 @@ -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState, useState } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState, useState } from '@etherealengine/hyperflux' export const AppLoadingStates = { START_STATE: 'START_STATE' as const, diff --git a/packages/client-core/src/common/services/AppService.ts b/packages/client-core/src/common/services/AppService.ts index c44b1a2e7c..ad4b29d195 100644 --- a/packages/client-core/src/common/services/AppService.ts +++ b/packages/client-core/src/common/services/AppService.ts @@ -1,5 +1,5 @@ -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState, syncStateWithLocalStorage, useState } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState, syncStateWithLocalStorage, useState } from '@etherealengine/hyperflux' export const AppState = defineState({ name: 'AppState', diff --git a/packages/client-core/src/common/services/AppThemeState.ts b/packages/client-core/src/common/services/AppThemeState.ts index f96aaf3e6e..4fd0e0bd7d 100644 --- a/packages/client-core/src/common/services/AppThemeState.ts +++ b/packages/client-core/src/common/services/AppThemeState.ts @@ -1,7 +1,7 @@ -import { getCurrentTheme } from '@xrengine/common/src/constants/DefaultThemeSettings' -import { ThemeOptions } from '@xrengine/common/src/interfaces/ClientSetting' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState, useHookstate } from '@xrengine/hyperflux' +import { getCurrentTheme } from '@etherealengine/common/src/constants/DefaultThemeSettings' +import { ThemeOptions } from '@etherealengine/common/src/interfaces/ClientSetting' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState, useHookstate } from '@etherealengine/hyperflux' import { AdminClientSettingsState } from '../../admin/services/Setting/ClientSettingService' import { AuthState } from '../../user/services/AuthService' diff --git a/packages/client-core/src/common/services/DialogService.ts b/packages/client-core/src/common/services/DialogService.ts index 5cd1b428d3..17911dd91f 100755 --- a/packages/client-core/src/common/services/DialogService.ts +++ b/packages/client-core/src/common/services/DialogService.ts @@ -1,6 +1,6 @@ -import { DialogSeed } from '@xrengine/common/src/interfaces/Dialog' -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { DialogSeed } from '@etherealengine/common/src/interfaces/Dialog' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' //State const DialogState = defineState({ diff --git a/packages/client-core/src/common/services/FileBrowserService.ts b/packages/client-core/src/common/services/FileBrowserService.ts index 38d4c7ece3..dddcee8a06 100644 --- a/packages/client-core/src/common/services/FileBrowserService.ts +++ b/packages/client-core/src/common/services/FileBrowserService.ts @@ -1,8 +1,8 @@ import { Paginated } from '@feathersjs/feathers/lib' -import { FileContentType } from '@xrengine/common/src/interfaces/FileContentType' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { FileContentType } from '@etherealengine/common/src/interfaces/FileContentType' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/common/services/InstanceService.ts b/packages/client-core/src/common/services/InstanceService.ts index 6d4896a260..ca54ea6a7d 100644 --- a/packages/client-core/src/common/services/InstanceService.ts +++ b/packages/client-core/src/common/services/InstanceService.ts @@ -1,6 +1,6 @@ import { Paginated } from '@feathersjs/client' -import { Instance } from '@xrengine/common/src/interfaces/Instance' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' import { API } from '../../API' diff --git a/packages/client-core/src/common/services/LocationInstanceConnectionService.ts b/packages/client-core/src/common/services/LocationInstanceConnectionService.ts index 24a6d0100a..e203322b6f 100755 --- a/packages/client-core/src/common/services/LocationInstanceConnectionService.ts +++ b/packages/client-core/src/common/services/LocationInstanceConnectionService.ts @@ -2,13 +2,13 @@ import { Paginated } from '@feathersjs/feathers' import { none, State } from '@hookstate/core' import React, { useEffect } from 'react' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import logger from '@xrengine/common/src/logger' -import { matches, matchesUserId, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { NetworkTopics } from '@xrengine/engine/src/networking/classes/Network' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import logger from '@etherealengine/common/src/logger' +import { matches, matchesUserId, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { NetworkTopics } from '@etherealengine/engine/src/networking/classes/Network' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { leaveNetwork } from '../../transports/SocketWebRTCClientFunctions' diff --git a/packages/client-core/src/common/services/MediaInstanceConnectionService.ts b/packages/client-core/src/common/services/MediaInstanceConnectionService.ts index 0bb7d36de7..0be5f68a89 100755 --- a/packages/client-core/src/common/services/MediaInstanceConnectionService.ts +++ b/packages/client-core/src/common/services/MediaInstanceConnectionService.ts @@ -1,13 +1,13 @@ import { Downgraded, none, State } from '@hookstate/core' import React, { useEffect } from 'react' -import { ChannelType } from '@xrengine/common/src/interfaces/Channel' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { matches, matchesUserId, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { NetworkTopics } from '@xrengine/engine/src/networking/classes/Network' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { ChannelType } from '@etherealengine/common/src/interfaces/Channel' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, matchesUserId, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { NetworkTopics } from '@etherealengine/engine/src/networking/classes/Network' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { accessChatState } from '../../social/services/ChatService' diff --git a/packages/client-core/src/common/services/NetworkConnectionService.ts b/packages/client-core/src/common/services/NetworkConnectionService.ts index 0faca3d2d1..c4809af541 100644 --- a/packages/client-core/src/common/services/NetworkConnectionService.ts +++ b/packages/client-core/src/common/services/NetworkConnectionService.ts @@ -1,5 +1,5 @@ -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction } from '@xrengine/hyperflux' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction } from '@etherealengine/hyperflux' export class NetworkConnectionService { static actions = { diff --git a/packages/client-core/src/common/services/NotificationService.ts b/packages/client-core/src/common/services/NotificationService.ts index 30c8851115..c02d1fe372 100755 --- a/packages/client-core/src/common/services/NotificationService.ts +++ b/packages/client-core/src/common/services/NotificationService.ts @@ -1,8 +1,8 @@ import { VariantType } from 'notistack' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, dispatchAction } from '@xrengine/hyperflux' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, dispatchAction } from '@etherealengine/hyperflux' import { defaultAction } from '../components/NotificationActions' diff --git a/packages/client-core/src/common/services/OEmbedService.ts b/packages/client-core/src/common/services/OEmbedService.ts index 580361bf83..a7676e5228 100644 --- a/packages/client-core/src/common/services/OEmbedService.ts +++ b/packages/client-core/src/common/services/OEmbedService.ts @@ -1,7 +1,7 @@ -import { OEmbed } from '@xrengine/common/src/interfaces/OEmbed' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { OEmbed } from '@etherealengine/common/src/interfaces/OEmbed' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from './NotificationService' diff --git a/packages/client-core/src/common/services/ProjectService.ts b/packages/client-core/src/common/services/ProjectService.ts index 7a2622a44b..7fd4b51240 100644 --- a/packages/client-core/src/common/services/ProjectService.ts +++ b/packages/client-core/src/common/services/ProjectService.ts @@ -1,12 +1,12 @@ import { useEffect } from 'react' -import { BuilderInfo } from '@xrengine/common/src/interfaces/BuilderInfo' -import { BuilderTag } from '@xrengine/common/src/interfaces/BuilderTags' -import { ProjectInterface, ProjectUpdateType } from '@xrengine/common/src/interfaces/ProjectInterface' -import { UpdateProjectInterface } from '@xrengine/common/src/interfaces/UpdateProjectInterface' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { BuilderInfo } from '@etherealengine/common/src/interfaces/BuilderInfo' +import { BuilderTag } from '@etherealengine/common/src/interfaces/BuilderTags' +import { ProjectInterface, ProjectUpdateType } from '@etherealengine/common/src/interfaces/ProjectInterface' +import { UpdateProjectInterface } from '@etherealengine/common/src/interfaces/UpdateProjectInterface' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from './NotificationService' diff --git a/packages/client-core/src/common/services/RouterService.ts b/packages/client-core/src/common/services/RouterService.ts index 67bc40e0a6..14dbe0d029 100644 --- a/packages/client-core/src/common/services/RouterService.ts +++ b/packages/client-core/src/common/services/RouterService.ts @@ -1,5 +1,5 @@ -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' export const RouterState = defineState({ name: 'RouterState', diff --git a/packages/client-core/src/common/utils.ts b/packages/client-core/src/common/utils.ts index dd24410489..81b65691f6 100644 --- a/packages/client-core/src/common/utils.ts +++ b/packages/client-core/src/common/utils.ts @@ -1,4 +1,4 @@ -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' export const handleSoundEffect = () => { AudioEffectPlayer.instance.play(AudioEffectPlayer.SOUNDS.ui) diff --git a/packages/client-core/src/components/ARPlacement/index.tsx b/packages/client-core/src/components/ARPlacement/index.tsx index fc3c640934..067d42a150 100644 --- a/packages/client-core/src/components/ARPlacement/index.tsx +++ b/packages/client-core/src/components/ARPlacement/index.tsx @@ -1,11 +1,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { XRState } from '@xrengine/engine/src/xr/XRState' -import { dispatchAction, getState, useHookstate } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { XRState } from '@etherealengine/engine/src/xr/XRState' +import { dispatchAction, getState, useHookstate } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { AppAction } from '../../common/services/AppService' import { useShelfStyles } from '../Shelves/useShelfStyles' diff --git a/packages/client-core/src/components/AlertModals/WarningRetryModal.tsx b/packages/client-core/src/components/AlertModals/WarningRetryModal.tsx index d00209016a..8113aba659 100755 --- a/packages/client-core/src/components/AlertModals/WarningRetryModal.tsx +++ b/packages/client-core/src/components/AlertModals/WarningRetryModal.tsx @@ -2,9 +2,9 @@ import classNames from 'classnames' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Modal from '@xrengine/ui/src/Modal' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Modal from '@etherealengine/ui/src/Modal' import styles from './index.module.scss' diff --git a/packages/client-core/src/components/AlertModals/index.module.scss b/packages/client-core/src/components/AlertModals/index.module.scss index aeb1fd915b..8b03bd5b10 100755 --- a/packages/client-core/src/components/AlertModals/index.module.scss +++ b/packages/client-core/src/components/AlertModals/index.module.scss @@ -1,4 +1,4 @@ -@import "@xrengine/client-core/src/styles/imports.module.scss"; +@import "@etherealengine/client-core/src/styles/imports.module.scss"; .paper { @include paper-modal; diff --git a/packages/client-core/src/components/ConferenceMode/ConferenceModeParticipant.tsx b/packages/client-core/src/components/ConferenceMode/ConferenceModeParticipant.tsx index ff592f0052..3f837f9689 100644 --- a/packages/client-core/src/components/ConferenceMode/ConferenceModeParticipant.tsx +++ b/packages/client-core/src/components/ConferenceMode/ConferenceModeParticipant.tsx @@ -1,12 +1,12 @@ import classNames from 'classnames' import React from 'react' -import { getAvatarURLForUser } from '@xrengine/client-core/src/user/components/UserMenu/util' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Slider from '@xrengine/ui/src/Slider' -import Tooltip from '@xrengine/ui/src/Tooltip' +import { getAvatarURLForUser } from '@etherealengine/client-core/src/user/components/UserMenu/util' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Slider from '@etherealengine/ui/src/Slider' +import Tooltip from '@etherealengine/ui/src/Tooltip' import { useUserMediaWindowHook } from '../UserMediaWindow' import styles from './index.module.scss' diff --git a/packages/client-core/src/components/ConferenceMode/index.tsx b/packages/client-core/src/components/ConferenceMode/index.tsx index 4fb4506ab0..c6d3e153f0 100644 --- a/packages/client-core/src/components/ConferenceMode/index.tsx +++ b/packages/client-core/src/components/ConferenceMode/index.tsx @@ -2,11 +2,11 @@ import { useState } from '@hookstate/core' import classNames from 'classnames' import React from 'react' -import { useMediaInstanceConnectionState } from '@xrengine/client-core/src/common/services/MediaInstanceConnectionService' -import { useMediaStreamState } from '@xrengine/client-core/src/media/services/MediaStreamService' -import { accessAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { useNetworkUserState } from '@xrengine/client-core/src/user/services/NetworkUserService' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' +import { useMediaInstanceConnectionState } from '@etherealengine/client-core/src/common/services/MediaInstanceConnectionService' +import { useMediaStreamState } from '@etherealengine/client-core/src/media/services/MediaStreamService' +import { accessAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { useNetworkUserState } from '@etherealengine/client-core/src/user/services/NetworkUserService' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' import ConferenceModeParticipant from './ConferenceModeParticipant' import styles from './index.module.scss' diff --git a/packages/client-core/src/components/Debug/index.tsx b/packages/client-core/src/components/Debug/index.tsx index af3a9c4623..7db1799ba8 100755 --- a/packages/client-core/src/components/Debug/index.tsx +++ b/packages/client-core/src/components/Debug/index.tsx @@ -3,27 +3,27 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' import JSONTree from 'react-json-tree' -import { mapToObject } from '@xrengine/common/src/utils/mapToObject' -import { AvatarControllerComponent } from '@xrengine/engine/src/avatar/components/AvatarControllerComponent' -import { respawnAvatar } from '@xrengine/engine/src/avatar/functions/respawnAvatar' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import { mapToObject } from '@etherealengine/common/src/utils/mapToObject' +import { AvatarControllerComponent } from '@etherealengine/engine/src/avatar/components/AvatarControllerComponent' +import { respawnAvatar } from '@etherealengine/engine/src/avatar/functions/respawnAvatar' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import { Component, getComponent, getOptionalComponent, hasComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { entityExists } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { EntityOrObjectUUID, EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { SystemInstance } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { RendererState } from '@xrengine/engine/src/renderer/RendererState' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' -import { dispatchAction, getState, useHookstate } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { entityExists } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { EntityOrObjectUUID, EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { SystemInstance } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { RendererState } from '@etherealengine/engine/src/renderer/RendererState' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' +import { dispatchAction, getState, useHookstate } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { StatsPanel } from './StatsPanel' import styles from './styles.module.scss' diff --git a/packages/client-core/src/components/Fullscreen/index.tsx b/packages/client-core/src/components/Fullscreen/index.tsx index 5d189deadb..f9331ca8c5 100644 --- a/packages/client-core/src/components/Fullscreen/index.tsx +++ b/packages/client-core/src/components/Fullscreen/index.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import Icon from '@xrengine/ui/src/Icon' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import Icon from '@etherealengine/ui/src/Icon' import { useShelfStyles } from '../Shelves/useShelfStyles' import { useFullscreen } from '../useFullscreen' diff --git a/packages/client-core/src/components/FullscreenContainer.tsx b/packages/client-core/src/components/FullscreenContainer.tsx index 45d35ee1d6..a5d421a1c1 100644 --- a/packages/client-core/src/components/FullscreenContainer.tsx +++ b/packages/client-core/src/components/FullscreenContainer.tsx @@ -1,8 +1,8 @@ import React, { Suspense, useCallback, useEffect, useRef, useState } from 'react' import { FullScreen, useFullScreenHandle } from 'react-full-screen' -import { FullscreenContext } from '@xrengine/client-core/src/components/useFullscreen' -import { iOS } from '@xrengine/engine/src/common/functions/isMobile' +import { FullscreenContext } from '@etherealengine/client-core/src/components/useFullscreen' +import { iOS } from '@etherealengine/engine/src/common/functions/isMobile' type Props = { children: JSX.Element | JSX.Element[] } diff --git a/packages/client-core/src/components/InstanceChat/InstanceChat.skiptest.tsx b/packages/client-core/src/components/InstanceChat/InstanceChat.skiptest.tsx index 1484174858..ab8914c122 100644 --- a/packages/client-core/src/components/InstanceChat/InstanceChat.skiptest.tsx +++ b/packages/client-core/src/components/InstanceChat/InstanceChat.skiptest.tsx @@ -3,8 +3,8 @@ import React from 'react' import { createRoot } from 'react-dom/client' import { act } from 'react-dom/test-utils' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { createEngine } from '@xrengine/engine/src/initializeEngine' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { createEngine } from '@etherealengine/engine/src/initializeEngine' import { InstanceChat } from '.' import { createDOM } from '../../../tests/createDOM' @@ -12,7 +12,7 @@ import { createMockAPI } from '../../../tests/createMockAPI' import { API } from '../../API' import { accessChatState } from '../../social/services/ChatService' -import '@xrengine/engine/src/patchEngineNode' +import '@etherealengine/engine/src/patchEngineNode' describe('Instance Chat Component', () => { let rootContainer: HTMLDivElement diff --git a/packages/client-core/src/components/InstanceChat/index.tsx b/packages/client-core/src/components/InstanceChat/index.tsx index 9bbc3525af..1844ec258a 100755 --- a/packages/client-core/src/components/InstanceChat/index.tsx +++ b/packages/client-core/src/components/InstanceChat/index.tsx @@ -5,24 +5,28 @@ import { useTranslation } from 'react-i18next' import { useLocationInstanceConnectionState, useWorldInstance -} from '@xrengine/client-core/src/common/services/LocationInstanceConnectionService' -import { ChatService, ChatServiceReceptor, useChatState } from '@xrengine/client-core/src/social/services/ChatService' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import multiLogger from '@xrengine/common/src/logger' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineState, useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { WorldNetworkAction } from '@xrengine/engine/src/networking/functions/WorldNetworkAction' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { addActionReceptor, dispatchAction, removeActionReceptor } from '@xrengine/hyperflux' -import { getState } from '@xrengine/hyperflux' -import Avatar from '@xrengine/ui/src/Avatar' -import Badge from '@xrengine/ui/src/Badge' -import Card from '@xrengine/ui/src/Card' -import CardContent from '@xrengine/ui/src/CardContent' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import TextField from '@xrengine/ui/src/TextField' +} from '@etherealengine/client-core/src/common/services/LocationInstanceConnectionService' +import { + ChatService, + ChatServiceReceptor, + useChatState +} from '@etherealengine/client-core/src/social/services/ChatService' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import multiLogger from '@etherealengine/common/src/logger' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineState, useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { WorldNetworkAction } from '@etherealengine/engine/src/networking/functions/WorldNetworkAction' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { addActionReceptor, dispatchAction, removeActionReceptor } from '@etherealengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' +import Avatar from '@etherealengine/ui/src/Avatar' +import Badge from '@etherealengine/ui/src/Badge' +import Card from '@etherealengine/ui/src/Card' +import CardContent from '@etherealengine/ui/src/CardContent' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import TextField from '@etherealengine/ui/src/TextField' import { Close as CloseIcon, Message as MessageIcon } from '@mui/icons-material' import Fab from '@mui/material/Fab' diff --git a/packages/client-core/src/components/InviteToast/index.tsx b/packages/client-core/src/components/InviteToast/index.tsx index a24ed46fec..33c44201c5 100644 --- a/packages/client-core/src/components/InviteToast/index.tsx +++ b/packages/client-core/src/components/InviteToast/index.tsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import { Button } from '@xrengine/editor/src/components/inputs/Button' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import { Button } from '@etherealengine/editor/src/components/inputs/Button' import { InviteService, useInviteState } from '../../social/services/InviteService' import { useAuthState } from '../../user/services/AuthService' diff --git a/packages/client-core/src/components/LoadingCircle.tsx b/packages/client-core/src/components/LoadingCircle.tsx index 6491eb251e..dea9cc8164 100644 --- a/packages/client-core/src/components/LoadingCircle.tsx +++ b/packages/client-core/src/components/LoadingCircle.tsx @@ -1,6 +1,6 @@ import React from 'react' -import CircularProgress from '@xrengine/ui/src/CircularProgress' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' type Props = { message?: string diff --git a/packages/client-core/src/components/LocationIcons/index.tsx b/packages/client-core/src/components/LocationIcons/index.tsx index 479990c7a5..3d80b0fb63 100755 --- a/packages/client-core/src/components/LocationIcons/index.tsx +++ b/packages/client-core/src/components/LocationIcons/index.tsx @@ -1,11 +1,11 @@ import React from 'react' -import { TouchGamepad } from '@xrengine/client-core/src/common/components/TouchGamepad' -import { UserMenu } from '@xrengine/client-core/src/user/components/UserMenu' -import { iOS } from '@xrengine/engine/src/common/functions/isMobile' -import { EngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { getCameraMode, XRState } from '@xrengine/engine/src/xr/XRState' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { TouchGamepad } from '@etherealengine/client-core/src/common/components/TouchGamepad' +import { UserMenu } from '@etherealengine/client-core/src/user/components/UserMenu' +import { iOS } from '@etherealengine/engine/src/common/functions/isMobile' +import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { getCameraMode, XRState } from '@etherealengine/engine/src/xr/XRState' +import { getState, useHookstate } from '@etherealengine/hyperflux' import { LoadingSystemState } from '../../systems/state/LoadingState' import { ARPlacement } from '../ARPlacement' diff --git a/packages/client-core/src/components/MediaIconsBox/index.tsx b/packages/client-core/src/components/MediaIconsBox/index.tsx index ac37716a90..a9a7ad9c07 100755 --- a/packages/client-core/src/components/MediaIconsBox/index.tsx +++ b/packages/client-core/src/components/MediaIconsBox/index.tsx @@ -1,21 +1,21 @@ import React, { useEffect, useState } from 'react' -import { useMediaInstanceConnectionState } from '@xrengine/client-core/src/common/services/MediaInstanceConnectionService' -import { useMediaStreamState } from '@xrengine/client-core/src/media/services/MediaStreamService' -import { useLocationState } from '@xrengine/client-core/src/social/services/LocationService' +import { useMediaInstanceConnectionState } from '@etherealengine/client-core/src/common/services/MediaInstanceConnectionService' +import { useMediaStreamState } from '@etherealengine/client-core/src/media/services/MediaStreamService' +import { useLocationState } from '@etherealengine/client-core/src/social/services/LocationService' import { toggleFaceTracking, toggleMicrophonePaused, toggleScreenshare, toggleWebcamPaused -} from '@xrengine/client-core/src/transports/SocketWebRTCClientFunctions' -import logger from '@xrengine/common/src/logger' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions, useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { XRAction, XRState } from '@xrengine/engine/src/xr/XRState' -import { dispatchAction, getState, useHookstate } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +} from '@etherealengine/client-core/src/transports/SocketWebRTCClientFunctions' +import logger from '@etherealengine/common/src/logger' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions, useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { XRAction, XRState } from '@etherealengine/engine/src/xr/XRState' +import { dispatchAction, getState, useHookstate } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { VrIcon } from '../../common/components/Icons/VrIcon' import { useShelfStyles } from '../Shelves/useShelfStyles' diff --git a/packages/client-core/src/components/Recorder/index.tsx b/packages/client-core/src/components/Recorder/index.tsx index d6b38b1287..e5f6ccb3de 100644 --- a/packages/client-core/src/components/Recorder/index.tsx +++ b/packages/client-core/src/components/Recorder/index.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import multiLogger from '@xrengine/common/src/logger' +import multiLogger from '@etherealengine/common/src/logger' import styles from './index.module.scss' diff --git a/packages/client-core/src/components/Shelves/index.tsx b/packages/client-core/src/components/Shelves/index.tsx index f134d08078..68278d71e5 100755 --- a/packages/client-core/src/components/Shelves/index.tsx +++ b/packages/client-core/src/components/Shelves/index.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { dispatchAction, getState, useHookstate } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { dispatchAction, getState, useHookstate } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { AppAction, AppState } from '../../common/services/AppService' import styles from './index.module.scss' diff --git a/packages/client-core/src/components/Shelves/useShelfStyles.ts b/packages/client-core/src/components/Shelves/useShelfStyles.ts index 65dfea4bdb..77d6ab76ed 100644 --- a/packages/client-core/src/components/Shelves/useShelfStyles.ts +++ b/packages/client-core/src/components/Shelves/useShelfStyles.ts @@ -1,6 +1,6 @@ import { useHookstate } from '@hookstate/core' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { AppState } from '../../common/services/AppService' import shelfStyles from './index.module.scss' diff --git a/packages/client-core/src/components/UserMediaWindow/index.tsx b/packages/client-core/src/components/UserMediaWindow/index.tsx index 987e10e49e..230cc23495 100755 --- a/packages/client-core/src/components/UserMediaWindow/index.tsx +++ b/packages/client-core/src/components/UserMediaWindow/index.tsx @@ -4,8 +4,8 @@ import hark from 'hark' import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import { useMediaStreamState } from '@xrengine/client-core/src/media/services/MediaStreamService' -import { useLocationState } from '@xrengine/client-core/src/social/services/LocationService' +import { useMediaStreamState } from '@etherealengine/client-core/src/media/services/MediaStreamService' +import { useLocationState } from '@etherealengine/client-core/src/social/services/LocationService' import { globalMuteProducer, globalUnmuteProducer, @@ -15,25 +15,25 @@ import { toggleScreenshareAudioPaused, toggleScreenshareVideoPaused, toggleWebcamPaused -} from '@xrengine/client-core/src/transports/SocketWebRTCClientFunctions' -import { getAvatarURLForUser } from '@xrengine/client-core/src/user/components/UserMenu/util' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { useNetworkUserState } from '@xrengine/client-core/src/user/services/NetworkUserService' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { AudioSettingAction, useAudioState } from '@xrengine/engine/src/audio/AudioState' -import { getMediaSceneMetadataState } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { isMobile } from '@xrengine/engine/src/common/functions/isMobile' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { MediaSettingsState } from '@xrengine/engine/src/networking/MediaSettingsState' -import { applyScreenshareToTexture } from '@xrengine/engine/src/scene/functions/applyScreenshareToTexture' -import { dispatchAction, getState } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Slider from '@xrengine/ui/src/Slider' -import Tooltip from '@xrengine/ui/src/Tooltip' +} from '@etherealengine/client-core/src/transports/SocketWebRTCClientFunctions' +import { getAvatarURLForUser } from '@etherealengine/client-core/src/user/components/UserMenu/util' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { useNetworkUserState } from '@etherealengine/client-core/src/user/services/NetworkUserService' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { AudioSettingAction, useAudioState } from '@etherealengine/engine/src/audio/AudioState' +import { getMediaSceneMetadataState } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { isMobile } from '@etherealengine/engine/src/common/functions/isMobile' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { MediaSettingsState } from '@etherealengine/engine/src/networking/MediaSettingsState' +import { applyScreenshareToTexture } from '@etherealengine/engine/src/scene/functions/applyScreenshareToTexture' +import { dispatchAction, getState } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Slider from '@etherealengine/ui/src/Slider' +import Tooltip from '@etherealengine/ui/src/Tooltip' import { useMediaInstance } from '../../common/services/MediaInstanceConnectionService' import { MediaStreamState } from '../../transports/MediaStreams' diff --git a/packages/client-core/src/components/UserMediaWindows/index.tsx b/packages/client-core/src/components/UserMediaWindows/index.tsx index 2d69f6dfe0..591b7a8dc9 100755 --- a/packages/client-core/src/components/UserMediaWindows/index.tsx +++ b/packages/client-core/src/components/UserMediaWindows/index.tsx @@ -1,8 +1,8 @@ import { useHookstate } from '@hookstate/core' import React from 'react' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { getState } from '@xrengine/hyperflux' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { getState } from '@etherealengine/hyperflux' import { PeerMediaChannelState, PeerMediaStreamInterface } from '../../transports/PeerMediaChannelState' import { useShelfStyles } from '../Shelves/useShelfStyles' diff --git a/packages/client-core/src/components/World/InstanceServerWarnings.tsx b/packages/client-core/src/components/World/InstanceServerWarnings.tsx index 8def3eccb2..7167b7beb2 100644 --- a/packages/client-core/src/components/World/InstanceServerWarnings.tsx +++ b/packages/client-core/src/components/World/InstanceServerWarnings.tsx @@ -4,17 +4,17 @@ import { useTranslation } from 'react-i18next' import { LocationInstanceConnectionService, useLocationInstanceConnectionState -} from '@xrengine/client-core/src/common/services/LocationInstanceConnectionService' -import { MediaInstanceConnectionService } from '@xrengine/client-core/src/common/services/MediaInstanceConnectionService' -import { ChatService, useChatState } from '@xrengine/client-core/src/social/services/ChatService' -import { useLocationState } from '@xrengine/client-core/src/social/services/LocationService' -import { SocketWebRTCClientNetwork } from '@xrengine/client-core/src/transports/SocketWebRTCClientNetwork' -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { RendererState } from '@xrengine/engine/src/renderer/RendererState' -import WEBGL from '@xrengine/engine/src/renderer/THREE.WebGL' -import { addActionReceptor, getState, useHookstate } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/common/services/LocationInstanceConnectionService' +import { MediaInstanceConnectionService } from '@etherealengine/client-core/src/common/services/MediaInstanceConnectionService' +import { ChatService, useChatState } from '@etherealengine/client-core/src/social/services/ChatService' +import { useLocationState } from '@etherealengine/client-core/src/social/services/LocationService' +import { SocketWebRTCClientNetwork } from '@etherealengine/client-core/src/transports/SocketWebRTCClientNetwork' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { RendererState } from '@etherealengine/engine/src/renderer/RendererState' +import WEBGL from '@etherealengine/engine/src/renderer/THREE.WebGL' +import { addActionReceptor, getState, useHookstate } from '@etherealengine/hyperflux' import { NetworkConnectionService } from '../../common/services/NetworkConnectionService' import { LocationAction } from '../../social/services/LocationService' diff --git a/packages/client-core/src/components/World/LoadEngineWithScene.tsx b/packages/client-core/src/components/World/LoadEngineWithScene.tsx index 879762bafa..cabc555f03 100755 --- a/packages/client-core/src/components/World/LoadEngineWithScene.tsx +++ b/packages/client-core/src/components/World/LoadEngineWithScene.tsx @@ -2,26 +2,26 @@ import { useHookstate } from '@hookstate/core' import React, { useEffect, useState } from 'react' import { useParams } from 'react-router-dom' -import { LocationInstanceConnectionServiceReceptor } from '@xrengine/client-core/src/common/services/LocationInstanceConnectionService' -import { LocationService } from '@xrengine/client-core/src/social/services/LocationService' -import { leaveNetwork } from '@xrengine/client-core/src/transports/SocketWebRTCClientFunctions' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { SceneServiceReceptor, useSceneState } from '@xrengine/client-core/src/world/services/SceneService' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { getSearchParamFromURL } from '@xrengine/common/src/utils/getSearchParamFromURL' -import { getRandomSpawnPoint, getSpawnPoint } from '@xrengine/engine/src/avatar/AvatarSpawnSystem' -import { teleportAvatar } from '@xrengine/engine/src/avatar/functions/moveAvatar' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions, useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { addComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { SystemModuleType } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { spawnLocalAvatarInWorld } from '@xrengine/engine/src/networking/functions/receiveJoinWorld' -import { PortalEffects } from '@xrengine/engine/src/scene/components/PortalComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import { setAvatarToLocationTeleportingState } from '@xrengine/engine/src/scene/functions/loaders/PortalFunctions' -import { XRState } from '@xrengine/engine/src/xr/XRState' -import { addActionReceptor, dispatchAction, getState, removeActionReceptor } from '@xrengine/hyperflux' +import { LocationInstanceConnectionServiceReceptor } from '@etherealengine/client-core/src/common/services/LocationInstanceConnectionService' +import { LocationService } from '@etherealengine/client-core/src/social/services/LocationService' +import { leaveNetwork } from '@etherealengine/client-core/src/transports/SocketWebRTCClientFunctions' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { SceneServiceReceptor, useSceneState } from '@etherealengine/client-core/src/world/services/SceneService' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { getSearchParamFromURL } from '@etherealengine/common/src/utils/getSearchParamFromURL' +import { getRandomSpawnPoint, getSpawnPoint } from '@etherealengine/engine/src/avatar/AvatarSpawnSystem' +import { teleportAvatar } from '@etherealengine/engine/src/avatar/functions/moveAvatar' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions, useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { addComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { SystemModuleType } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { spawnLocalAvatarInWorld } from '@etherealengine/engine/src/networking/functions/receiveJoinWorld' +import { PortalEffects } from '@etherealengine/engine/src/scene/components/PortalComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import { setAvatarToLocationTeleportingState } from '@etherealengine/engine/src/scene/functions/loaders/PortalFunctions' +import { XRState } from '@etherealengine/engine/src/xr/XRState' +import { addActionReceptor, dispatchAction, getState, removeActionReceptor } from '@etherealengine/hyperflux' import { AppLoadingAction, AppLoadingStates, useLoadingState } from '../../common/services/AppLoadingService' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/components/World/LoadLocationScene.tsx b/packages/client-core/src/components/World/LoadLocationScene.tsx index b178395bad..15321a94f0 100755 --- a/packages/client-core/src/components/World/LoadLocationScene.tsx +++ b/packages/client-core/src/components/World/LoadLocationScene.tsx @@ -1,10 +1,10 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { LocationAction, useLocationState } from '@xrengine/client-core/src/social/services/LocationService' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { dispatchAction } from '@xrengine/hyperflux' +import { LocationAction, useLocationState } from '@etherealengine/client-core/src/social/services/LocationService' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { dispatchAction } from '@etherealengine/hyperflux' import { retrieveLocationByName } from './LocationLoadHelper' diff --git a/packages/client-core/src/components/World/LocationLoadHelper.tsx b/packages/client-core/src/components/World/LocationLoadHelper.tsx index 2012d32ee4..782aa74948 100644 --- a/packages/client-core/src/components/World/LocationLoadHelper.tsx +++ b/packages/client-core/src/components/World/LocationLoadHelper.tsx @@ -1,15 +1,15 @@ import { useNavigate } from 'react-router-dom' -import { LocationService } from '@xrengine/client-core/src/social/services/LocationService' -import config from '@xrengine/common/src/config' -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' -import multiLogger from '@xrengine/common/src/logger' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions, EngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { initSystems, SystemModuleType } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { updateSceneFromJSON } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -import { dispatchAction, getState } from '@xrengine/hyperflux' -import { loadEngineInjection } from '@xrengine/projects/loadEngineInjection' +import { LocationService } from '@etherealengine/client-core/src/social/services/LocationService' +import config from '@etherealengine/common/src/config' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' +import multiLogger from '@etherealengine/common/src/logger' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions, EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { initSystems, SystemModuleType } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { updateSceneFromJSON } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +import { dispatchAction, getState } from '@etherealengine/hyperflux' +import { loadEngineInjection } from '@etherealengine/projects/loadEngineInjection' import { API } from '../../API' import { ClientModules } from '../../world/ClientModules' diff --git a/packages/client-core/src/components/World/NetworkInstanceProvisioning.tsx b/packages/client-core/src/components/World/NetworkInstanceProvisioning.tsx index 4285c5e767..e4c66b270f 100644 --- a/packages/client-core/src/components/World/NetworkInstanceProvisioning.tsx +++ b/packages/client-core/src/components/World/NetworkInstanceProvisioning.tsx @@ -4,25 +4,28 @@ import { LocationInstanceConnectionService, useLocationInstanceConnectionState, useWorldInstance -} from '@xrengine/client-core/src/common/services/LocationInstanceConnectionService' +} from '@etherealengine/client-core/src/common/services/LocationInstanceConnectionService' import { MediaInstanceConnectionService, useMediaInstance, useMediaInstanceConnectionState -} from '@xrengine/client-core/src/common/services/MediaInstanceConnectionService' -import { MediaServiceReceptor, MediaStreamService } from '@xrengine/client-core/src/media/services/MediaStreamService' -import { ChatAction, ChatService, useChatState } from '@xrengine/client-core/src/social/services/ChatService' -import { useLocationState } from '@xrengine/client-core/src/social/services/LocationService' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' +} from '@etherealengine/client-core/src/common/services/MediaInstanceConnectionService' +import { + MediaServiceReceptor, + MediaStreamService +} from '@etherealengine/client-core/src/media/services/MediaStreamService' +import { ChatAction, ChatService, useChatState } from '@etherealengine/client-core/src/social/services/ChatService' +import { useLocationState } from '@etherealengine/client-core/src/social/services/LocationService' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' import { NetworkUserService, NetworkUserServiceReceptor, useNetworkUserState -} from '@xrengine/client-core/src/user/services/NetworkUserService' -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { addActionReceptor, dispatchAction, removeActionReceptor } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/user/services/NetworkUserService' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { addActionReceptor, dispatchAction, removeActionReceptor } from '@etherealengine/hyperflux' import { PeerMedia } from '../../media/PeerMedia' import { PartyService, usePartyState } from '../../social/services/PartyService' diff --git a/packages/client-core/src/components/World/OfflineLocation.tsx b/packages/client-core/src/components/World/OfflineLocation.tsx index a9cc691d4e..8cbc6b06d8 100644 --- a/packages/client-core/src/components/World/OfflineLocation.tsx +++ b/packages/client-core/src/components/World/OfflineLocation.tsx @@ -1,13 +1,13 @@ import React, { useEffect } from 'react' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { Network, NetworkTopics } from '@xrengine/engine/src/networking/classes/Network' -import { NetworkPeerFunctions } from '@xrengine/engine/src/networking/functions/NetworkPeerFunctions' -import { receiveJoinWorld } from '@xrengine/engine/src/networking/functions/receiveJoinWorld' -import { addOutgoingTopicIfNecessary, useState } from '@xrengine/hyperflux' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { Network, NetworkTopics } from '@etherealengine/engine/src/networking/classes/Network' +import { NetworkPeerFunctions } from '@etherealengine/engine/src/networking/functions/NetworkPeerFunctions' +import { receiveJoinWorld } from '@etherealengine/engine/src/networking/functions/receiveJoinWorld' +import { addOutgoingTopicIfNecessary, useState } from '@etherealengine/hyperflux' import InstanceServerWarnings from './InstanceServerWarnings' diff --git a/packages/client-core/src/components/XRLoading/index.tsx b/packages/client-core/src/components/XRLoading/index.tsx index fb8ffdddca..1c3ba8ad5c 100644 --- a/packages/client-core/src/components/XRLoading/index.tsx +++ b/packages/client-core/src/components/XRLoading/index.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { XRState } from '@xrengine/engine/src/xr/XRState' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { XRState } from '@etherealengine/engine/src/xr/XRState' +import { getState, useHookstate } from '@etherealengine/hyperflux' import { LoadingCircle } from '../LoadingCircle' diff --git a/packages/client-core/src/media/PeerMedia.tsx b/packages/client-core/src/media/PeerMedia.tsx index 7282152caf..8778caac65 100644 --- a/packages/client-core/src/media/PeerMedia.tsx +++ b/packages/client-core/src/media/PeerMedia.tsx @@ -1,10 +1,10 @@ import React, { useEffect } from 'react' -import { MediaTagType } from '@xrengine/common/src/interfaces/MediaStreamConstants' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { MediaTagType } from '@etherealengine/common/src/interfaces/MediaStreamConstants' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { getState, useHookstate } from '@etherealengine/hyperflux' import { MediaInstanceState } from '../common/services/MediaInstanceConnectionService' import { MediaStreamState } from '../transports/MediaStreams' diff --git a/packages/client-core/src/media/services/MediaStreamService.ts b/packages/client-core/src/media/services/MediaStreamService.ts index 7358455954..ed2e774101 100755 --- a/packages/client-core/src/media/services/MediaStreamService.ts +++ b/packages/client-core/src/media/services/MediaStreamService.ts @@ -1,10 +1,10 @@ import mediasoup from 'mediasoup-client' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getNearbyUsers } from '@xrengine/engine/src/networking/functions/getNearbyUsers' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getNearbyUsers } from '@etherealengine/engine/src/networking/functions/getNearbyUsers' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { MediaStreamState } from '../../transports/MediaStreams' import { ConsumerExtension, SocketWebRTCClientNetwork } from '../../transports/SocketWebRTCClientNetwork' diff --git a/packages/client-core/src/media/webcam/WebcamInput.ts b/packages/client-core/src/media/webcam/WebcamInput.ts index a6cbfabdc3..4bc31f2f4f 100755 --- a/packages/client-core/src/media/webcam/WebcamInput.ts +++ b/packages/client-core/src/media/webcam/WebcamInput.ts @@ -1,22 +1,22 @@ import type { FaceDetection, FaceExpressions } from '@vladmandic/face-api' import * as Comlink from 'comlink' -import { isDev } from '@xrengine/common/src/config' -import { createWorkerFromCrossOriginURL } from '@xrengine/common/src/utils/createWorkerFromCrossOriginURL' -import { AvatarRigComponent } from '@xrengine/engine/src/avatar/components/AvatarAnimationComponent' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { isDev } from '@etherealengine/common/src/config' +import { createWorkerFromCrossOriginURL } from '@etherealengine/common/src/utils/createWorkerFromCrossOriginURL' +import { AvatarRigComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { defineQuery, getComponent, hasComponent, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { WebcamInputComponent } from '@xrengine/engine/src/input/components/WebcamInputComponent' -import { WorldNetworkAction } from '@xrengine/engine/src/networking/functions/WorldNetworkAction' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { createActionQueue, getState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { WebcamInputComponent } from '@etherealengine/engine/src/input/components/WebcamInputComponent' +import { WorldNetworkAction } from '@etherealengine/engine/src/networking/functions/WorldNetworkAction' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { createActionQueue, getState } from '@etherealengine/hyperflux' import { MediaStreamState } from '../../transports/MediaStreams' diff --git a/packages/client-core/src/social/services/ChatService.ts b/packages/client-core/src/social/services/ChatService.ts index 488b38b3ab..db536a5008 100755 --- a/packages/client-core/src/social/services/ChatService.ts +++ b/packages/client-core/src/social/services/ChatService.ts @@ -2,16 +2,16 @@ import { Paginated } from '@feathersjs/feathers' import { none } from '@hookstate/core' import { useEffect } from 'react' -import { Channel } from '@xrengine/common/src/interfaces/Channel' -import { Group } from '@xrengine/common/src/interfaces/Group' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { Message } from '@xrengine/common/src/interfaces/Message' -import { Party } from '@xrengine/common/src/interfaces/Party' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Channel } from '@etherealengine/common/src/interfaces/Channel' +import { Group } from '@etherealengine/common/src/interfaces/Group' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { Message } from '@etherealengine/common/src/interfaces/Message' +import { Party } from '@etherealengine/common/src/interfaces/Party' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/social/services/FriendService.ts b/packages/client-core/src/social/services/FriendService.ts index b6d3f8259b..0b4466335b 100644 --- a/packages/client-core/src/social/services/FriendService.ts +++ b/packages/client-core/src/social/services/FriendService.ts @@ -1,11 +1,11 @@ import i18n from 'i18next' import { useEffect } from 'react' -import { Relationship } from '@xrengine/common/src/interfaces/Relationship' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Relationship } from '@etherealengine/common/src/interfaces/Relationship' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/social/services/GroupService.ts b/packages/client-core/src/social/services/GroupService.ts index 191fb2a003..2af2271f80 100644 --- a/packages/client-core/src/social/services/GroupService.ts +++ b/packages/client-core/src/social/services/GroupService.ts @@ -1,10 +1,10 @@ import { none } from '@hookstate/core' import { useEffect } from 'react' -import { CreateGroup, Group } from '@xrengine/common/src/interfaces/Group' -import { GroupUser } from '@xrengine/common/src/interfaces/GroupUser' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { CreateGroup, Group } from '@etherealengine/common/src/interfaces/Group' +import { GroupUser } from '@etherealengine/common/src/interfaces/GroupUser' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/social/services/InviteService.ts b/packages/client-core/src/social/services/InviteService.ts index dcf52d7c98..1486073301 100644 --- a/packages/client-core/src/social/services/InviteService.ts +++ b/packages/client-core/src/social/services/InviteService.ts @@ -1,10 +1,10 @@ import { Paginated } from '@feathersjs/feathers' import { useEffect } from 'react' -import { Invite, SendInvite } from '@xrengine/common/src/interfaces/Invite' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Invite, SendInvite } from '@etherealengine/common/src/interfaces/Invite' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { MediaInstanceConnectionAction } from '../../common/services/MediaInstanceConnectionService' diff --git a/packages/client-core/src/social/services/InviteTypeService.ts b/packages/client-core/src/social/services/InviteTypeService.ts index 3555ca3f7d..3eb8f05bb5 100644 --- a/packages/client-core/src/social/services/InviteTypeService.ts +++ b/packages/client-core/src/social/services/InviteTypeService.ts @@ -1,8 +1,15 @@ import { Paginated } from '@feathersjs/feathers' -import { InviteType } from '@xrengine/common/src/interfaces/InviteType' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { addActionReceptor, defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { InviteType } from '@etherealengine/common/src/interfaces/InviteType' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { + addActionReceptor, + defineAction, + defineState, + dispatchAction, + getState, + useState +} from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/social/services/LocationService.ts b/packages/client-core/src/social/services/LocationService.ts index b7be509c68..e5956f00dc 100755 --- a/packages/client-core/src/social/services/LocationService.ts +++ b/packages/client-core/src/social/services/LocationService.ts @@ -1,9 +1,9 @@ import { Paginated } from '@feathersjs/feathers' -import { Location, LocationSeed } from '@xrengine/common/src/interfaces/Location' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Location, LocationSeed } from '@etherealengine/common/src/interfaces/Location' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/social/services/PartyService.ts b/packages/client-core/src/social/services/PartyService.ts index e7c15fab32..046b90b6f6 100755 --- a/packages/client-core/src/social/services/PartyService.ts +++ b/packages/client-core/src/social/services/PartyService.ts @@ -2,14 +2,14 @@ import { Paginated } from '@feathersjs/feathers' import i18n from 'i18next' import { useEffect } from 'react' -import { Channel } from '@xrengine/common/src/interfaces/Channel' -import { SendInvite } from '@xrengine/common/src/interfaces/Invite' -import { Party } from '@xrengine/common/src/interfaces/Party' -import { PartyUser } from '@xrengine/common/src/interfaces/PartyUser' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { Channel } from '@etherealengine/common/src/interfaces/Channel' +import { SendInvite } from '@etherealengine/common/src/interfaces/Invite' +import { Party } from '@etherealengine/common/src/interfaces/Party' +import { PartyUser } from '@etherealengine/common/src/interfaces/PartyUser' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { diff --git a/packages/client-core/src/social/services/WebxrNativeService.ts b/packages/client-core/src/social/services/WebxrNativeService.ts index fb75aab514..284310ec59 100755 --- a/packages/client-core/src/social/services/WebxrNativeService.ts +++ b/packages/client-core/src/social/services/WebxrNativeService.ts @@ -1,7 +1,14 @@ import { createState } from '@hookstate/core' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { addActionReceptor, defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { + addActionReceptor, + defineAction, + defineState, + dispatchAction, + getState, + useState +} from '@etherealengine/hyperflux' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/systems/AdminSystem.tsx b/packages/client-core/src/systems/AdminSystem.tsx index e1805d8a5a..378879b9cc 100644 --- a/packages/client-core/src/systems/AdminSystem.tsx +++ b/packages/client-core/src/systems/AdminSystem.tsx @@ -1,5 +1,5 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { AdminActiveRouteActions, AdminActiveRouteReceptors } from '../admin/services/ActiveRouteService' import { AdminAnalyticsActions, AdminAnalyticsReceptors } from '../admin/services/AnalyticsService' diff --git a/packages/client-core/src/systems/AvatarUISystem.tsx b/packages/client-core/src/systems/AvatarUISystem.tsx index b49c76a94c..de9f100669 100644 --- a/packages/client-core/src/systems/AvatarUISystem.tsx +++ b/packages/client-core/src/systems/AvatarUISystem.tsx @@ -3,14 +3,14 @@ import { Consumer } from 'mediasoup-client/lib/Consumer' import { useEffect } from 'react' import { Group, Matrix4, Vector3 } from 'three' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { AvatarComponent } from '@xrengine/engine/src/avatar/components/AvatarComponent' -import { easeOutElastic } from '@xrengine/engine/src/common/functions/MathFunctions' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { AvatarComponent } from '@etherealengine/engine/src/avatar/components/AvatarComponent' +import { easeOutElastic } from '@etherealengine/engine/src/common/functions/MathFunctions' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { defineQuery, getComponent, @@ -18,22 +18,22 @@ import { removeComponent, removeQuery, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { removeEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { NetworkObjectComponent } from '@xrengine/engine/src/networking/components/NetworkObjectComponent' -import { NetworkObjectOwnedTag } from '@xrengine/engine/src/networking/components/NetworkObjectComponent' -import { shouldUseImmersiveMedia } from '@xrengine/engine/src/networking/MediaSettingsState' -import { Physics, RaycastArgs } from '@xrengine/engine/src/physics/classes/Physics' -import { CollisionGroups } from '@xrengine/engine/src/physics/enums/CollisionGroups' -import { getInteractionGroups } from '@xrengine/engine/src/physics/functions/getInteractionGroups' -import { SceneQueryType } from '@xrengine/engine/src/physics/types/PhysicsTypes' -import { addObjectToGroup } from '@xrengine/engine/src/scene/components/GroupComponent' -import { setVisibleComponent, VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { applyVideoToTexture } from '@xrengine/engine/src/scene/functions/applyScreenshareToTexture' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { XRUIComponent, XRUIInteractableComponent } from '@xrengine/engine/src/xrui/components/XRUIComponent' -import { createTransitionState } from '@xrengine/engine/src/xrui/functions/createTransitionState' -import { getState, startReactor, useHookstate } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { NetworkObjectComponent } from '@etherealengine/engine/src/networking/components/NetworkObjectComponent' +import { NetworkObjectOwnedTag } from '@etherealengine/engine/src/networking/components/NetworkObjectComponent' +import { shouldUseImmersiveMedia } from '@etherealengine/engine/src/networking/MediaSettingsState' +import { Physics, RaycastArgs } from '@etherealengine/engine/src/physics/classes/Physics' +import { CollisionGroups } from '@etherealengine/engine/src/physics/enums/CollisionGroups' +import { getInteractionGroups } from '@etherealengine/engine/src/physics/functions/getInteractionGroups' +import { SceneQueryType } from '@etherealengine/engine/src/physics/types/PhysicsTypes' +import { addObjectToGroup } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { setVisibleComponent, VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { applyVideoToTexture } from '@etherealengine/engine/src/scene/functions/applyScreenshareToTexture' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { XRUIComponent, XRUIInteractableComponent } from '@etherealengine/engine/src/xrui/components/XRUIComponent' +import { createTransitionState } from '@etherealengine/engine/src/xrui/functions/createTransitionState' +import { getState, startReactor, useHookstate } from '@etherealengine/hyperflux' import { createAvatarDetailView } from './ui/AvatarDetailView' import { createAvatarContextMenuView } from './ui/UserMenuView' diff --git a/packages/client-core/src/systems/LoadingUISystem.tsx b/packages/client-core/src/systems/LoadingUISystem.tsx index a2183a44e7..88d9d13141 100755 --- a/packages/client-core/src/systems/LoadingUISystem.tsx +++ b/packages/client-core/src/systems/LoadingUISystem.tsx @@ -1,30 +1,30 @@ import { useEffect } from 'react' import { DoubleSide, Mesh, MeshBasicMaterial, SphereGeometry, Texture } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions, EngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions, EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { addComponent, getComponent, removeComponent, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { removeEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { setVisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' -import { textureLoader } from '@xrengine/engine/src/scene/constants/Util' -import { setObjectLayers } from '@xrengine/engine/src/scene/functions/setObjectLayers' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { setVisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' +import { textureLoader } from '@etherealengine/engine/src/scene/constants/Util' +import { setObjectLayers } from '@etherealengine/engine/src/scene/functions/setObjectLayers' import { ComputedTransformComponent, setComputedTransformComponent -} from '@xrengine/engine/src/transform/components/ComputedTransformComponent' -import { XRUIComponent } from '@xrengine/engine/src/xrui/components/XRUIComponent' -import { createTransitionState } from '@xrengine/engine/src/xrui/functions/createTransitionState' -import { ObjectFitFunctions } from '@xrengine/engine/src/xrui/functions/ObjectFitFunctions' -import { createActionQueue, getState, removeActionQueue, startReactor, useHookstate } from '@xrengine/hyperflux' -import type { WebLayer3D } from '@xrengine/xrui' +} from '@etherealengine/engine/src/transform/components/ComputedTransformComponent' +import { XRUIComponent } from '@etherealengine/engine/src/xrui/components/XRUIComponent' +import { createTransitionState } from '@etherealengine/engine/src/xrui/functions/createTransitionState' +import { ObjectFitFunctions } from '@etherealengine/engine/src/xrui/functions/ObjectFitFunctions' +import { createActionQueue, getState, removeActionQueue, startReactor, useHookstate } from '@etherealengine/hyperflux' +import type { WebLayer3D } from '@etherealengine/xrui' import { AppLoadingState, AppLoadingStates, useLoadingState } from '../common/services/AppLoadingService' import { SceneActions } from '../world/services/SceneService' diff --git a/packages/client-core/src/systems/PortalLoadSystem.ts b/packages/client-core/src/systems/PortalLoadSystem.ts index 092eaea22b..a12d4a7306 100644 --- a/packages/client-core/src/systems/PortalLoadSystem.ts +++ b/packages/client-core/src/systems/PortalLoadSystem.ts @@ -1,11 +1,11 @@ import { Euler, Texture } from 'three' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { defineQuery, getComponent, removeQuery } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { entityExists } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { PortalComponent } from '@xrengine/engine/src/scene/components/PortalComponent' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { defineQuery, getComponent, removeQuery } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { entityExists } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { PortalComponent } from '@etherealengine/engine/src/scene/components/PortalComponent' import { API } from '../API' diff --git a/packages/client-core/src/systems/ProjectUpdateSystem.tsx b/packages/client-core/src/systems/ProjectUpdateSystem.tsx index 27ae518b82..b8e0455886 100644 --- a/packages/client-core/src/systems/ProjectUpdateSystem.tsx +++ b/packages/client-core/src/systems/ProjectUpdateSystem.tsx @@ -1,4 +1,4 @@ -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { ProjectUpdateActions, ProjectUpdateReceptors } from '../admin/services/ProjectUpdateService' diff --git a/packages/client-core/src/systems/WidgetUISystem.ts b/packages/client-core/src/systems/WidgetUISystem.ts index 727d0cdaf2..21fd7e9ede 100644 --- a/packages/client-core/src/systems/WidgetUISystem.ts +++ b/packages/client-core/src/systems/WidgetUISystem.ts @@ -1,15 +1,15 @@ import { useEffect } from 'react' import { AxesHelper, Matrix4, Quaternion, Vector3 } from 'three' -import { isDev } from '@xrengine/common/src/config' -import { AvatarRigComponent } from '@xrengine/engine/src/avatar/components/AvatarAnimationComponent' +import { isDev } from '@etherealengine/common/src/config' +import { AvatarRigComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent' import { AvatarInputSettingsAction, AvatarInputSettingsState -} from '@xrengine/engine/src/avatar/state/AvatarInputSettingsState' -import { V_001, V_010, V_111 } from '@xrengine/engine/src/common/constants/MathConstants' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' +} from '@etherealengine/engine/src/avatar/state/AvatarInputSettingsState' +import { V_001, V_010, V_111 } from '@etherealengine/engine/src/common/constants/MathConstants' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { addComponent, getComponent, @@ -17,27 +17,31 @@ import { hasComponent, removeComponent, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { removeEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { EngineRenderer } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { addObjectToGroup } from '@xrengine/engine/src/scene/components/GroupComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { setVisibleComponent, VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' -import { setObjectLayers } from '@xrengine/engine/src/scene/functions/setObjectLayers' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { EngineRenderer } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { addObjectToGroup } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { setVisibleComponent, VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' +import { setObjectLayers } from '@etherealengine/engine/src/scene/functions/setObjectLayers' import { ComputedTransformComponent, setComputedTransformComponent -} from '@xrengine/engine/src/transform/components/ComputedTransformComponent' +} from '@etherealengine/engine/src/transform/components/ComputedTransformComponent' import { LocalTransformComponent, setLocalTransformComponent, TransformComponent -} from '@xrengine/engine/src/transform/components/TransformComponent' -import { getPreferredInputSource, isHeadset, ReferenceSpace, XRState } from '@xrengine/engine/src/xr/XRState' -import { XRUIInteractableComponent } from '@xrengine/engine/src/xrui/components/XRUIComponent' -import { ObjectFitFunctions } from '@xrengine/engine/src/xrui/functions/ObjectFitFunctions' -import { WidgetAppActions, WidgetAppServiceReceptor, WidgetAppState } from '@xrengine/engine/src/xrui/WidgetAppService' +} from '@etherealengine/engine/src/transform/components/TransformComponent' +import { getPreferredInputSource, isHeadset, ReferenceSpace, XRState } from '@etherealengine/engine/src/xr/XRState' +import { XRUIInteractableComponent } from '@etherealengine/engine/src/xrui/components/XRUIComponent' +import { ObjectFitFunctions } from '@etherealengine/engine/src/xrui/functions/ObjectFitFunctions' +import { + WidgetAppActions, + WidgetAppServiceReceptor, + WidgetAppState +} from '@etherealengine/engine/src/xrui/WidgetAppService' import { addActionReceptor, createActionQueue, @@ -46,7 +50,7 @@ import { removeActionQueue, startReactor, useHookstate -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { createAnchorWidget } from './createAnchorWidget' // import { createHeightAdjustmentWidget } from './createHeightAdjustmentWidget' diff --git a/packages/client-core/src/systems/components/XRCheckboxButton/index.tsx b/packages/client-core/src/systems/components/XRCheckboxButton/index.tsx index 07f92db382..d259c6d955 100644 --- a/packages/client-core/src/systems/components/XRCheckboxButton/index.tsx +++ b/packages/client-core/src/systems/components/XRCheckboxButton/index.tsx @@ -1,6 +1,6 @@ import React from 'react' -import Icon from '@xrengine/ui/src/Icon' +import Icon from '@etherealengine/ui/src/Icon' import styleString from './index.scss?inline' diff --git a/packages/client-core/src/systems/components/XRSelectDropdown/index.tsx b/packages/client-core/src/systems/components/XRSelectDropdown/index.tsx index 587a632ee5..0c8d94fcaf 100644 --- a/packages/client-core/src/systems/components/XRSelectDropdown/index.tsx +++ b/packages/client-core/src/systems/components/XRSelectDropdown/index.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' -import Icon from '@xrengine/ui/src/Icon' +import Icon from '@etherealengine/ui/src/Icon' import styleString from './index.scss?inline' diff --git a/packages/client-core/src/systems/createAdminControlsMenuWidget.tsx b/packages/client-core/src/systems/createAdminControlsMenuWidget.tsx index 24f45dc911..208f0f8b8a 100644 --- a/packages/client-core/src/systems/createAdminControlsMenuWidget.tsx +++ b/packages/client-core/src/systems/createAdminControlsMenuWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createAdminControlsMenuView } from './ui/AdminControlsMenuView' diff --git a/packages/client-core/src/systems/createAnchorWidget.tsx b/packages/client-core/src/systems/createAnchorWidget.tsx index 2413b456f7..b8a51547a8 100644 --- a/packages/client-core/src/systems/createAnchorWidget.tsx +++ b/packages/client-core/src/systems/createAnchorWidget.tsx @@ -1,13 +1,13 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent, setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { ReferenceSpace, XRAction, XRState } from '@xrengine/engine/src/xr/XRState' -import { XRUIInteractableComponent } from '@xrengine/engine/src/xrui/components/XRUIComponent' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppActions, WidgetAppState } from '@xrengine/engine/src/xrui/WidgetAppService' -import { Widget, Widgets } from '@xrengine/engine/src/xrui/Widgets' -import { createActionQueue, dispatchAction, getState, removeActionQueue } from '@xrengine/hyperflux' -import AnchorIcon from '@xrengine/ui/src/Icon' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent, setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { ReferenceSpace, XRAction, XRState } from '@etherealengine/engine/src/xr/XRState' +import { XRUIInteractableComponent } from '@etherealengine/engine/src/xrui/components/XRUIComponent' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppActions, WidgetAppState } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { Widget, Widgets } from '@etherealengine/engine/src/xrui/Widgets' +import { createActionQueue, dispatchAction, getState, removeActionQueue } from '@etherealengine/hyperflux' +import AnchorIcon from '@etherealengine/ui/src/Icon' import { AnchorWidgetUI } from './ui/AnchorWidgetUI' diff --git a/packages/client-core/src/systems/createChatWidget.tsx b/packages/client-core/src/systems/createChatWidget.tsx index b6716bedaf..b94997e0c6 100644 --- a/packages/client-core/src/systems/createChatWidget.tsx +++ b/packages/client-core/src/systems/createChatWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createChatDetailView } from './ui/ChatDetailView' diff --git a/packages/client-core/src/systems/createEmoteWidget.tsx b/packages/client-core/src/systems/createEmoteWidget.tsx index cd836135ec..578c3b06e9 100644 --- a/packages/client-core/src/systems/createEmoteWidget.tsx +++ b/packages/client-core/src/systems/createEmoteWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createEmoteDetailView } from './ui/EmoteDetailView' diff --git a/packages/client-core/src/systems/createHeightAdjustmentWidget.tsx b/packages/client-core/src/systems/createHeightAdjustmentWidget.tsx index 481949c20a..fe3c3e8181 100644 --- a/packages/client-core/src/systems/createHeightAdjustmentWidget.tsx +++ b/packages/client-core/src/systems/createHeightAdjustmentWidget.tsx @@ -1,14 +1,14 @@ -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent, setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { ReferenceSpace, XRState } from '@xrengine/engine/src/xr/XRState' -import { XRUIInteractableComponent } from '@xrengine/engine/src/xrui/components/XRUIComponent' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppActions } from '@xrengine/engine/src/xrui/WidgetAppService' -import { Widget, Widgets } from '@xrengine/engine/src/xrui/Widgets' -import { dispatchAction, getState } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent, setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { ReferenceSpace, XRState } from '@etherealengine/engine/src/xr/XRState' +import { XRUIInteractableComponent } from '@etherealengine/engine/src/xrui/components/XRUIComponent' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppActions } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { Widget, Widgets } from '@etherealengine/engine/src/xrui/Widgets' +import { dispatchAction, getState } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' export function createHeightAdjustmentWidget(world: World) { const ui = createXRUI(() => null) diff --git a/packages/client-core/src/systems/createLocationMenuWidget.tsx b/packages/client-core/src/systems/createLocationMenuWidget.tsx index 4a5c4eb097..761c0552d0 100644 --- a/packages/client-core/src/systems/createLocationMenuWidget.tsx +++ b/packages/client-core/src/systems/createLocationMenuWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createLocationMenuView } from './ui/LocationMenuView' diff --git a/packages/client-core/src/systems/createMediaSessionMenuWidget.tsx b/packages/client-core/src/systems/createMediaSessionMenuWidget.tsx index 8abe8e51f2..3fda61bee5 100644 --- a/packages/client-core/src/systems/createMediaSessionMenuWidget.tsx +++ b/packages/client-core/src/systems/createMediaSessionMenuWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createMediaSessionMenuView } from './ui/MediaSessionMenuView' diff --git a/packages/client-core/src/systems/createProfileWidget.tsx b/packages/client-core/src/systems/createProfileWidget.tsx index 4ce4361386..cda1ec33f5 100644 --- a/packages/client-core/src/systems/createProfileWidget.tsx +++ b/packages/client-core/src/systems/createProfileWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createProfileDetailView } from './ui/ProfileDetailView' diff --git a/packages/client-core/src/systems/createReadyPlayerWidget.tsx b/packages/client-core/src/systems/createReadyPlayerWidget.tsx index 5e5f0ba288..90971a5265 100644 --- a/packages/client-core/src/systems/createReadyPlayerWidget.tsx +++ b/packages/client-core/src/systems/createReadyPlayerWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createReadyPlayerMenu } from './ui/ProfileDetailView/ReadyPlayerMenu' diff --git a/packages/client-core/src/systems/createSelectAvatarWidget.tsx b/packages/client-core/src/systems/createSelectAvatarWidget.tsx index be96db65d5..18f30b41ff 100644 --- a/packages/client-core/src/systems/createSelectAvatarWidget.tsx +++ b/packages/client-core/src/systems/createSelectAvatarWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createSelectAvatarMenu } from './ui/ProfileDetailView/SelectAvatarMenu' diff --git a/packages/client-core/src/systems/createSettingsWidget.tsx b/packages/client-core/src/systems/createSettingsWidget.tsx index 0e4f9ba3c5..e57e508e04 100644 --- a/packages/client-core/src/systems/createSettingsWidget.tsx +++ b/packages/client-core/src/systems/createSettingsWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createSettingDetailView } from './ui/SettingDetailView' diff --git a/packages/client-core/src/systems/createShareLocationWidget.tsx b/packages/client-core/src/systems/createShareLocationWidget.tsx index 054df75d50..8f635d3a34 100644 --- a/packages/client-core/src/systems/createShareLocationWidget.tsx +++ b/packages/client-core/src/systems/createShareLocationWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createShareLocationDetailView } from './ui/ShareLocationDetailView' diff --git a/packages/client-core/src/systems/createSocialsMenuWidget.tsx b/packages/client-core/src/systems/createSocialsMenuWidget.tsx index dd3cf3d3d5..b9f4e83550 100644 --- a/packages/client-core/src/systems/createSocialsMenuWidget.tsx +++ b/packages/client-core/src/systems/createSocialsMenuWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createSocialsMenuView } from './ui/SocialsMenuView' diff --git a/packages/client-core/src/systems/createUploadAvatarWidget.tsx b/packages/client-core/src/systems/createUploadAvatarWidget.tsx index 6683689887..45cd99c66f 100644 --- a/packages/client-core/src/systems/createUploadAvatarWidget.tsx +++ b/packages/client-core/src/systems/createUploadAvatarWidget.tsx @@ -1,7 +1,7 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { WidgetName, Widgets } from '@xrengine/engine/src/xrui/Widgets' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { WidgetName, Widgets } from '@etherealengine/engine/src/xrui/Widgets' import { createUploadAvatarMenu } from './ui/ProfileDetailView/UploadAvatarMenu' diff --git a/packages/client-core/src/systems/state/LoadingState.ts b/packages/client-core/src/systems/state/LoadingState.ts index 52c76ffac9..ea93003b74 100644 --- a/packages/client-core/src/systems/state/LoadingState.ts +++ b/packages/client-core/src/systems/state/LoadingState.ts @@ -1,4 +1,4 @@ -import { defineState } from '@xrengine/hyperflux' +import { defineState } from '@etherealengine/hyperflux' export const LoadingSystemState = defineState({ name: 'LoadingSystemState', diff --git a/packages/client-core/src/systems/state/PartySystem.tsx b/packages/client-core/src/systems/state/PartySystem.tsx index f7353dd50f..4f688c7280 100644 --- a/packages/client-core/src/systems/state/PartySystem.tsx +++ b/packages/client-core/src/systems/state/PartySystem.tsx @@ -1,4 +1,4 @@ -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { PartyActions, PartyServiceReceptors } from '../../social/services/PartyService' diff --git a/packages/client-core/src/systems/ui/AdminControlsMenuView/index.tsx b/packages/client-core/src/systems/ui/AdminControlsMenuView/index.tsx index f9c9ba6054..5be3cb1e40 100644 --- a/packages/client-core/src/systems/ui/AdminControlsMenuView/index.tsx +++ b/packages/client-core/src/systems/ui/AdminControlsMenuView/index.tsx @@ -2,8 +2,8 @@ import { createState } from '@hookstate/core' import React from 'react' import { useTranslation } from 'react-i18next' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import Icon from '@xrengine/ui/src/Icon' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import Icon from '@etherealengine/ui/src/Icon' import XRTextButton from '../../components/XRTextButton' import styleString from './index.scss?inline' diff --git a/packages/client-core/src/systems/ui/AvatarDetailView/index.tsx b/packages/client-core/src/systems/ui/AvatarDetailView/index.tsx index 43049fa7b7..44c51fb1d2 100644 --- a/packages/client-core/src/systems/ui/AvatarDetailView/index.tsx +++ b/packages/client-core/src/systems/ui/AvatarDetailView/index.tsx @@ -4,11 +4,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { CircleGeometry, Mesh, MeshBasicMaterial } from 'three' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { addComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { useXRUIState } from '@xrengine/engine/src/xrui/functions/useXRUIState' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { addComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { useXRUIState } from '@etherealengine/engine/src/xrui/functions/useXRUIState' import { useNetworkUserState } from '../../../user/services/NetworkUserService' import styleString from './index.scss?inline' diff --git a/packages/client-core/src/systems/ui/ChatDetailView/index.tsx b/packages/client-core/src/systems/ui/ChatDetailView/index.tsx index c2498dfdac..bae8c37d1e 100644 --- a/packages/client-core/src/systems/ui/ChatDetailView/index.tsx +++ b/packages/client-core/src/systems/ui/ChatDetailView/index.tsx @@ -1,12 +1,12 @@ import { createState, useHookstate } from '@hookstate/core' import React, { Fragment, useRef, useState } from 'react' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { getState } from '@xrengine/hyperflux' -import Avatar from '@xrengine/ui/src/Avatar' -import Icon from '@xrengine/ui/src/Icon' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { getState } from '@etherealengine/hyperflux' +import Avatar from '@etherealengine/ui/src/Avatar' +import Icon from '@etherealengine/ui/src/Icon' import { useChatHooks } from '../../../components/InstanceChat' import { getAvatarURLForUser } from '../../../user/components/UserMenu/util' diff --git a/packages/client-core/src/systems/ui/EmoteDetailView/index.tsx b/packages/client-core/src/systems/ui/EmoteDetailView/index.tsx index 70e56bf8ef..cbb908f1c1 100644 --- a/packages/client-core/src/systems/ui/EmoteDetailView/index.tsx +++ b/packages/client-core/src/systems/ui/EmoteDetailView/index.tsx @@ -1,12 +1,12 @@ import { createState } from '@hookstate/core' import React, { useEffect, useState } from 'react' -import { changeAvatarAnimationState } from '@xrengine/engine/src/avatar/animation/AvatarAnimationGraph' -import { AvatarStates } from '@xrengine/engine/src/avatar/animation/Util' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import Button from '@xrengine/ui/src/Button' -import Icon from '@xrengine/ui/src/Icon' +import { changeAvatarAnimationState } from '@etherealengine/engine/src/avatar/animation/AvatarAnimationGraph' +import { AvatarStates } from '@etherealengine/engine/src/avatar/animation/Util' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import Button from '@etherealengine/ui/src/Button' +import Icon from '@etherealengine/ui/src/Icon' import XRIconButton from '../../components/XRIconButton' import styleString from './index.scss?inline' diff --git a/packages/client-core/src/systems/ui/LoadingDetailView/index.tsx b/packages/client-core/src/systems/ui/LoadingDetailView/index.tsx index 42fc065459..8b20a22387 100755 --- a/packages/client-core/src/systems/ui/LoadingDetailView/index.tsx +++ b/packages/client-core/src/systems/ui/LoadingDetailView/index.tsx @@ -4,13 +4,13 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Color } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { EngineRenderer } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { XRState } from '@xrengine/engine/src/xr/XRState' -import { createTransitionState } from '@xrengine/engine/src/xrui/functions/createTransitionState' -import { createXRUI, XRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { useXRUIState } from '@xrengine/engine/src/xrui/functions/useXRUIState' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { EngineRenderer } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { XRState } from '@etherealengine/engine/src/xr/XRState' +import { createTransitionState } from '@etherealengine/engine/src/xrui/functions/createTransitionState' +import { createXRUI, XRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { useXRUIState } from '@etherealengine/engine/src/xrui/functions/useXRUIState' import { AppLoadingStates, useLoadingState } from '../../../common/services/AppLoadingService' import { useSceneState } from '../../../world/services/SceneService' diff --git a/packages/client-core/src/systems/ui/LocationMenuView/index.tsx b/packages/client-core/src/systems/ui/LocationMenuView/index.tsx index fcd0c34bda..67353d6c84 100644 --- a/packages/client-core/src/systems/ui/LocationMenuView/index.tsx +++ b/packages/client-core/src/systems/ui/LocationMenuView/index.tsx @@ -2,15 +2,15 @@ import { createState, useState } from '@hookstate/core' import React from 'react' import { useTranslation } from 'react-i18next' -import { VrIcon } from '@xrengine/client-core/src/common/components/Icons/VrIcon' -import { respawnAvatar } from '@xrengine/engine/src/avatar/functions/respawnAvatar' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { XRAction, XRState } from '@xrengine/engine/src/xr/XRState' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppService } from '@xrengine/engine/src/xrui/WidgetAppService' -import { WidgetName } from '@xrengine/engine/src/xrui/Widgets' -import { dispatchAction, getState } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +import { VrIcon } from '@etherealengine/client-core/src/common/components/Icons/VrIcon' +import { respawnAvatar } from '@etherealengine/engine/src/avatar/functions/respawnAvatar' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { XRAction, XRState } from '@etherealengine/engine/src/xr/XRState' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppService } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { WidgetName } from '@etherealengine/engine/src/xrui/Widgets' +import { dispatchAction, getState } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { EmoteIcon } from '../../../user/components/UserMenu' import { useAuthState } from '../../../user/services/AuthService' diff --git a/packages/client-core/src/systems/ui/MediaSessionMenuView/index.tsx b/packages/client-core/src/systems/ui/MediaSessionMenuView/index.tsx index 94e8ed100f..a96c030907 100644 --- a/packages/client-core/src/systems/ui/MediaSessionMenuView/index.tsx +++ b/packages/client-core/src/systems/ui/MediaSessionMenuView/index.tsx @@ -2,10 +2,10 @@ import { createState } from '@hookstate/core' import React from 'react' import { useTranslation } from 'react-i18next' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppService } from '@xrengine/engine/src/xrui/WidgetAppService' -import { WidgetName } from '@xrengine/engine/src/xrui/Widgets' -import Icon from '@xrengine/ui/src/Icon' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppService } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { WidgetName } from '@etherealengine/engine/src/xrui/Widgets' +import Icon from '@etherealengine/ui/src/Icon' import { useMediaStreamState } from '../../../media/services/MediaStreamService' import { diff --git a/packages/client-core/src/systems/ui/ProfileDetailView/ReadyPlayerMenu.tsx b/packages/client-core/src/systems/ui/ProfileDetailView/ReadyPlayerMenu.tsx index 9c3ddf41b8..0e0e3cc88c 100755 --- a/packages/client-core/src/systems/ui/ProfileDetailView/ReadyPlayerMenu.tsx +++ b/packages/client-core/src/systems/ui/ProfileDetailView/ReadyPlayerMenu.tsx @@ -3,20 +3,20 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' import { PerspectiveCamera, Scene, WebGLRenderer } from 'three' -import config from '@xrengine/common/src/config' -import { THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH } from '@xrengine/common/src/constants/AvatarConstants' -import multiLogger from '@xrengine/common/src/logger' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { AvatarRigComponent } from '@xrengine/engine/src/avatar/components/AvatarAnimationComponent' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { getOrbitControls } from '@xrengine/engine/src/input/functions/loadOrbitControl' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppService } from '@xrengine/engine/src/xrui/WidgetAppService' -import { WidgetName } from '@xrengine/engine/src/xrui/Widgets' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Icon from '@xrengine/ui/src/Icon' +import config from '@etherealengine/common/src/config' +import { THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH } from '@etherealengine/common/src/constants/AvatarConstants' +import multiLogger from '@etherealengine/common/src/logger' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { AvatarRigComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { getOrbitControls } from '@etherealengine/engine/src/input/functions/loadOrbitControl' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppService } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { WidgetName } from '@etherealengine/engine/src/xrui/Widgets' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Icon from '@etherealengine/ui/src/Icon' import { loadAvatarForPreview, resetAnimationLogic, validate } from '../../../user/components/Panel3D/helperFunctions' import { useRender3DPanelSystem } from '../../../user/components/Panel3D/useRender3DPanelSystem' diff --git a/packages/client-core/src/systems/ui/ProfileDetailView/SelectAvatarMenu.tsx b/packages/client-core/src/systems/ui/ProfileDetailView/SelectAvatarMenu.tsx index 640d31d2c1..c3a7fb1ba8 100644 --- a/packages/client-core/src/systems/ui/ProfileDetailView/SelectAvatarMenu.tsx +++ b/packages/client-core/src/systems/ui/ProfileDetailView/SelectAvatarMenu.tsx @@ -2,15 +2,15 @@ import { createState, useHookstate } from '@hookstate/core' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { AvatarEffectComponent } from '@xrengine/engine/src/avatar/components/AvatarEffectComponent' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppService } from '@xrengine/engine/src/xrui/WidgetAppService' -import { WidgetName } from '@xrengine/engine/src/xrui/Widgets' -import { getState } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { AvatarEffectComponent } from '@etherealengine/engine/src/avatar/components/AvatarEffectComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppService } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { WidgetName } from '@etherealengine/engine/src/xrui/Widgets' +import { getState } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { useAuthState } from '../../../user/services/AuthService' import { AvatarService, AvatarState } from '../../../user/services/AvatarService' diff --git a/packages/client-core/src/systems/ui/ProfileDetailView/UploadAvatarMenu.tsx b/packages/client-core/src/systems/ui/ProfileDetailView/UploadAvatarMenu.tsx index e37bca9b41..0ab4f3b4a1 100755 --- a/packages/client-core/src/systems/ui/ProfileDetailView/UploadAvatarMenu.tsx +++ b/packages/client-core/src/systems/ui/ProfileDetailView/UploadAvatarMenu.tsx @@ -11,16 +11,16 @@ import { THUMBNAIL_FILE_ALLOWED_EXTENSIONS, THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH -} from '@xrengine/common/src/constants/AvatarConstants' -import multiLogger from '@xrengine/common/src/logger' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { AvatarRigComponent } from '@xrengine/engine/src/avatar/components/AvatarAnimationComponent' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppService } from '@xrengine/engine/src/xrui/WidgetAppService' -import { WidgetName } from '@xrengine/engine/src/xrui/Widgets' -import Icon from '@xrengine/ui/src/Icon' +} from '@etherealengine/common/src/constants/AvatarConstants' +import multiLogger from '@etherealengine/common/src/logger' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { AvatarRigComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppService } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { WidgetName } from '@etherealengine/engine/src/xrui/Widgets' +import Icon from '@etherealengine/ui/src/Icon' import { loadAvatarForPreview, validate } from '../../../user/components/Panel3D/helperFunctions' import { useRender3DPanelSystem } from '../../../user/components/Panel3D/useRender3DPanelSystem' diff --git a/packages/client-core/src/systems/ui/ProfileDetailView/index.scss b/packages/client-core/src/systems/ui/ProfileDetailView/index.scss index 34e556b7d0..095fd11f57 100644 --- a/packages/client-core/src/systems/ui/ProfileDetailView/index.scss +++ b/packages/client-core/src/systems/ui/ProfileDetailView/index.scss @@ -1,4 +1,4 @@ -@import "@xrengine/client-core/src/styles/imports.module.scss"; +@import "@etherealengine/client-core/src/styles/imports.module.scss"; .menuPanel { display: flex; diff --git a/packages/client-core/src/systems/ui/ProfileDetailView/index.tsx b/packages/client-core/src/systems/ui/ProfileDetailView/index.tsx index f963f284b1..e80bf04825 100755 --- a/packages/client-core/src/systems/ui/ProfileDetailView/index.tsx +++ b/packages/client-core/src/systems/ui/ProfileDetailView/index.tsx @@ -3,17 +3,17 @@ import { createState, useHookstate } from '@hookstate/core' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import config, { validateEmail, validatePhoneNumber } from '@xrengine/common/src/config' -import { defaultThemeModes, defaultThemeSettings } from '@xrengine/common/src/constants/DefaultThemeSettings' -import multiLogger from '@xrengine/common/src/logger' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppService } from '@xrengine/engine/src/xrui/WidgetAppService' -import { WidgetName } from '@xrengine/engine/src/xrui/Widgets' -import { getState } from '@xrengine/hyperflux' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import config, { validateEmail, validatePhoneNumber } from '@etherealengine/common/src/config' +import { defaultThemeModes, defaultThemeSettings } from '@etherealengine/common/src/constants/DefaultThemeSettings' +import multiLogger from '@etherealengine/common/src/logger' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppService } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { WidgetName } from '@etherealengine/engine/src/xrui/Widgets' +import { getState } from '@etherealengine/hyperflux' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { useAuthSettingState } from '../../../admin/services/Setting/AuthSettingService' import { useClientSettingState } from '../../../admin/services/Setting/ClientSettingService' diff --git a/packages/client-core/src/systems/ui/SettingDetailView/index.tsx b/packages/client-core/src/systems/ui/SettingDetailView/index.tsx index 8e403b03fe..076b664422 100644 --- a/packages/client-core/src/systems/ui/SettingDetailView/index.tsx +++ b/packages/client-core/src/systems/ui/SettingDetailView/index.tsx @@ -2,22 +2,22 @@ import { createState } from '@hookstate/core' import React, { useEffect, useLayoutEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import { UserSetting } from '@xrengine/common/src/interfaces/User' -import { AudioSettingAction, useAudioState } from '@xrengine/engine/src/audio/AudioState' -import { AvatarComponent } from '@xrengine/engine/src/avatar/components/AvatarComponent' +import { UserSetting } from '@etherealengine/common/src/interfaces/User' +import { AudioSettingAction, useAudioState } from '@etherealengine/engine/src/audio/AudioState' +import { AvatarComponent } from '@etherealengine/engine/src/avatar/components/AvatarComponent' import { AvatarAxesControlScheme, AvatarControllerType, AvatarInputSettingsAction, AvatarInputSettingsState -} from '@xrengine/engine/src/avatar/state/AvatarInputSettingsState' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { RendererState } from '@xrengine/engine/src/renderer/RendererState' -import { XRState } from '@xrengine/engine/src/xr/XRState' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { dispatchAction, getState, useHookstate } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +} from '@etherealengine/engine/src/avatar/state/AvatarInputSettingsState' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { RendererState } from '@etherealengine/engine/src/renderer/RendererState' +import { XRState } from '@etherealengine/engine/src/xr/XRState' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { dispatchAction, getState, useHookstate } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { AuthService, useAuthState } from '../../../user/services/AuthService' import XRCheckboxButton from '../../components/XRCheckboxButton' diff --git a/packages/client-core/src/systems/ui/ShareLocationDetailView/index.tsx b/packages/client-core/src/systems/ui/ShareLocationDetailView/index.tsx index f2db836d9a..56a2e31233 100644 --- a/packages/client-core/src/systems/ui/ShareLocationDetailView/index.tsx +++ b/packages/client-core/src/systems/ui/ShareLocationDetailView/index.tsx @@ -3,10 +3,10 @@ import { QRCodeSVG } from 'qrcode.react' import React, { useRef } from 'react' import { useTranslation } from 'react-i18next' -import { isShareAvailable } from '@xrengine/engine/src/common/functions/DetectFeatures' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import Icon from '@xrengine/ui/src/Icon' +import { isShareAvailable } from '@etherealengine/engine/src/common/functions/DetectFeatures' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import Icon from '@etherealengine/ui/src/Icon' import { useShareMenuHooks } from '../../../user/components/UserMenu/menus/ShareMenu' import XRCheckboxButton from '../../components/XRCheckboxButton' diff --git a/packages/client-core/src/systems/ui/SocialsMenuView/index.tsx b/packages/client-core/src/systems/ui/SocialsMenuView/index.tsx index da1f96555c..8b8627c0de 100644 --- a/packages/client-core/src/systems/ui/SocialsMenuView/index.tsx +++ b/packages/client-core/src/systems/ui/SocialsMenuView/index.tsx @@ -2,10 +2,10 @@ import { createState } from '@hookstate/core' import React from 'react' import { useTranslation } from 'react-i18next' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppService } from '@xrengine/engine/src/xrui/WidgetAppService' -import { WidgetName } from '@xrengine/engine/src/xrui/Widgets' -import Icon from '@xrengine/ui/src/Icon' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppService } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { WidgetName } from '@etherealengine/engine/src/xrui/Widgets' +import Icon from '@etherealengine/ui/src/Icon' import XRTextButton from '../../components/XRTextButton' import styleString from './index.scss?inline' diff --git a/packages/client-core/src/systems/ui/UserMenuView/index.tsx b/packages/client-core/src/systems/ui/UserMenuView/index.tsx index 7fedde3954..95b67e12e6 100644 --- a/packages/client-core/src/systems/ui/UserMenuView/index.tsx +++ b/packages/client-core/src/systems/ui/UserMenuView/index.tsx @@ -2,13 +2,13 @@ import { createState, useHookstate } from '@hookstate/core' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { SendInvite } from '@xrengine/common/src/interfaces/Invite' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { useXRUIState } from '@xrengine/engine/src/xrui/functions/useXRUIState' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { SendInvite } from '@etherealengine/common/src/interfaces/Invite' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { useXRUIState } from '@etherealengine/engine/src/xrui/functions/useXRUIState' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { FriendService, useFriendState } from '../../../social/services/FriendService' import { InviteService } from '../../../social/services/InviteService' diff --git a/packages/client-core/src/systems/ui/WidgetMenuView/index.tsx b/packages/client-core/src/systems/ui/WidgetMenuView/index.tsx index f2647f2552..9d0b313ebd 100644 --- a/packages/client-core/src/systems/ui/WidgetMenuView/index.tsx +++ b/packages/client-core/src/systems/ui/WidgetMenuView/index.tsx @@ -2,13 +2,13 @@ import { createState, useHookstate } from '@hookstate/core' import React, { useState } from 'react' // import { VrIcon } from '../../../common/components/Icons/VrIcon' -import { Channel } from '@xrengine/common/src/interfaces/Channel' -import { respawnAvatar } from '@xrengine/engine/src/avatar/functions/respawnAvatar' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { createXRUI } from '@xrengine/engine/src/xrui/functions/createXRUI' -import { WidgetAppActions, WidgetAppState } from '@xrengine/engine/src/xrui/WidgetAppService' -import { dispatchAction, getState } from '@xrengine/hyperflux' -import Icon from '@xrengine/ui/src/Icon' +import { Channel } from '@etherealengine/common/src/interfaces/Channel' +import { respawnAvatar } from '@etherealengine/engine/src/avatar/functions/respawnAvatar' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { createXRUI } from '@etherealengine/engine/src/xrui/functions/createXRUI' +import { WidgetAppActions, WidgetAppState } from '@etherealengine/engine/src/xrui/WidgetAppService' +import { dispatchAction, getState } from '@etherealengine/hyperflux' +import Icon from '@etherealengine/ui/src/Icon' import { useMediaInstance } from '../../../common/services/MediaInstanceConnectionService' import { useMediaStreamState } from '../../../media/services/MediaStreamService' diff --git a/packages/client-core/src/transports/MediaStreams.ts b/packages/client-core/src/transports/MediaStreams.ts index ae1a417d05..22d6026acd 100755 --- a/packages/client-core/src/transports/MediaStreams.ts +++ b/packages/client-core/src/transports/MediaStreams.ts @@ -1,9 +1,12 @@ import { Producer } from 'mediasoup-client/lib/Producer' -import multiLogger from '@xrengine/common/src/logger' -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { localAudioConstraints, localVideoConstraints } from '@xrengine/engine/src/networking/constants/VideoConstants' -import { defineAction, defineState, getState } from '@xrengine/hyperflux' +import multiLogger from '@etherealengine/common/src/logger' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { + localAudioConstraints, + localVideoConstraints +} from '@etherealengine/engine/src/networking/constants/VideoConstants' +import { defineAction, defineState, getState } from '@etherealengine/hyperflux' import { ProducerExtension } from './SocketWebRTCClientNetwork' diff --git a/packages/client-core/src/transports/PeerMediaChannelState.ts b/packages/client-core/src/transports/PeerMediaChannelState.ts index c079b84a48..a50534a8a9 100644 --- a/packages/client-core/src/transports/PeerMediaChannelState.ts +++ b/packages/client-core/src/transports/PeerMediaChannelState.ts @@ -1,5 +1,5 @@ -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { defineState, getState, none } from '@xrengine/hyperflux' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { defineState, getState, none } from '@etherealengine/hyperflux' import { ConsumerExtension, ProducerExtension } from './SocketWebRTCClientNetwork' diff --git a/packages/client-core/src/transports/SocketWebRTCClientFunctions.ts b/packages/client-core/src/transports/SocketWebRTCClientFunctions.ts index d4a997de0d..e99f4cc1ec 100755 --- a/packages/client-core/src/transports/SocketWebRTCClientFunctions.ts +++ b/packages/client-core/src/transports/SocketWebRTCClientFunctions.ts @@ -8,27 +8,30 @@ import { } from 'mediasoup-client/lib/types' import { v4 as uuidv4 } from 'uuid' -import config from '@xrengine/common/src/config' -import { AuthTask } from '@xrengine/common/src/interfaces/AuthTask' -import { ChannelType } from '@xrengine/common/src/interfaces/Channel' -import { MediaStreamAppData, MediaTagType } from '@xrengine/common/src/interfaces/MediaStreamConstants' -import { PeerID, PeersUpdateType } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { getSearchParamFromURL } from '@xrengine/common/src/utils/getSearchParamFromURL' -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { NetworkTopics } from '@xrengine/engine/src/networking/classes/Network' -import { PUBLIC_STUN_SERVERS } from '@xrengine/engine/src/networking/constants/STUNServers' +import config from '@etherealengine/common/src/config' +import { AuthTask } from '@etherealengine/common/src/interfaces/AuthTask' +import { ChannelType } from '@etherealengine/common/src/interfaces/Channel' +import { MediaStreamAppData, MediaTagType } from '@etherealengine/common/src/interfaces/MediaStreamConstants' +import { PeerID, PeersUpdateType } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { getSearchParamFromURL } from '@etherealengine/common/src/utils/getSearchParamFromURL' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { NetworkTopics } from '@etherealengine/engine/src/networking/classes/Network' +import { PUBLIC_STUN_SERVERS } from '@etherealengine/engine/src/networking/constants/STUNServers' import { CAM_VIDEO_SIMULCAST_ENCODINGS, SCREEN_SHARE_SIMULCAST_ENCODINGS -} from '@xrengine/engine/src/networking/constants/VideoConstants' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { NetworkPeerFunctions } from '@xrengine/engine/src/networking/functions/NetworkPeerFunctions' -import { receiveJoinMediaServer } from '@xrengine/engine/src/networking/functions/receiveJoinMediaServer' -import { JoinWorldRequestData, receiveJoinWorld } from '@xrengine/engine/src/networking/functions/receiveJoinWorld' +} from '@etherealengine/engine/src/networking/constants/VideoConstants' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { NetworkPeerFunctions } from '@etherealengine/engine/src/networking/functions/NetworkPeerFunctions' +import { receiveJoinMediaServer } from '@etherealengine/engine/src/networking/functions/receiveJoinMediaServer' +import { + JoinWorldRequestData, + receiveJoinWorld +} from '@etherealengine/engine/src/networking/functions/receiveJoinWorld' import { addActionReceptor, dispatchAction, @@ -36,8 +39,8 @@ import { none, removeActionReceptor, removeActionsForTopic -} from '@xrengine/hyperflux' -import { Action } from '@xrengine/hyperflux/functions/ActionFunctions' +} from '@etherealengine/hyperflux' +import { Action } from '@etherealengine/hyperflux/functions/ActionFunctions' import { LocationInstanceConnectionAction } from '../common/services/LocationInstanceConnectionService' import { diff --git a/packages/client-core/src/transports/SocketWebRTCClientNetwork.ts b/packages/client-core/src/transports/SocketWebRTCClientNetwork.ts index e8b47095de..27a7b1fe2c 100755 --- a/packages/client-core/src/transports/SocketWebRTCClientNetwork.ts +++ b/packages/client-core/src/transports/SocketWebRTCClientNetwork.ts @@ -2,16 +2,16 @@ import * as mediasoupClient from 'mediasoup-client' import { Consumer, DataProducer, Transport as MediaSoupTransport, Producer } from 'mediasoup-client/lib/types' import Primus from 'primus-client' -import config from '@xrengine/common/src/config' -import { Channel } from '@xrengine/common/src/interfaces/Channel' -import { MediaStreamAppData } from '@xrengine/common/src/interfaces/MediaStreamConstants' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Network } from '@xrengine/engine/src/networking/classes/Network' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { clearOutgoingActions, dispatchAction } from '@xrengine/hyperflux' -import { addOutgoingTopicIfNecessary, Topic } from '@xrengine/hyperflux/functions/ActionFunctions' +import config from '@etherealengine/common/src/config' +import { Channel } from '@etherealengine/common/src/interfaces/Channel' +import { MediaStreamAppData } from '@etherealengine/common/src/interfaces/MediaStreamConstants' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Network } from '@etherealengine/engine/src/networking/classes/Network' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { clearOutgoingActions, dispatchAction } from '@etherealengine/hyperflux' +import { addOutgoingTopicIfNecessary, Topic } from '@etherealengine/hyperflux/functions/ActionFunctions' import { accessLocationInstanceConnectionState, diff --git a/packages/client-core/src/transports/UpdateNearbyUsersSystem.ts b/packages/client-core/src/transports/UpdateNearbyUsersSystem.ts index 16c6f5a8cd..f9a714f662 100755 --- a/packages/client-core/src/transports/UpdateNearbyUsersSystem.ts +++ b/packages/client-core/src/transports/UpdateNearbyUsersSystem.ts @@ -1,7 +1,7 @@ -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { dispatchAction } from '@xrengine/hyperflux' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { dispatchAction } from '@etherealengine/hyperflux' import { accessMediaInstanceConnectionState } from '../common/services/MediaInstanceConnectionService' import { accessMediaStreamState, MediaStreamService } from '../media/services/MediaStreamService' diff --git a/packages/client-core/src/user/components/Auth/ConfirmEmail.tsx b/packages/client-core/src/user/components/Auth/ConfirmEmail.tsx index 0a9ea818a3..04830f9330 100755 --- a/packages/client-core/src/user/components/Auth/ConfirmEmail.tsx +++ b/packages/client-core/src/user/components/Auth/ConfirmEmail.tsx @@ -1,10 +1,10 @@ import React from 'react' import { Trans, useTranslation } from 'react-i18next' -import Box from '@xrengine/ui/src/Box' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import Typography from '@xrengine/ui/src/Typography' +import Box from '@etherealengine/ui/src/Box' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import Typography from '@etherealengine/ui/src/Typography' import EmptyLayout from '../../../common/components/EmptyLayout' import { AuthService } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Auth/ConfirmEmailApp.tsx b/packages/client-core/src/user/components/Auth/ConfirmEmailApp.tsx index a1f8027d07..f0ac3ca836 100755 --- a/packages/client-core/src/user/components/Auth/ConfirmEmailApp.tsx +++ b/packages/client-core/src/user/components/Auth/ConfirmEmailApp.tsx @@ -1,9 +1,9 @@ import React from 'react' import { Trans, useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import CardMedia from '@xrengine/ui/src/CardMedia' -import Typography from '@xrengine/ui/src/Typography' +import Button from '@etherealengine/ui/src/Button' +import CardMedia from '@etherealengine/ui/src/CardMedia' +import Typography from '@etherealengine/ui/src/Typography' import { useRouter } from '../../../common/services/RouterService' import { AuthService, useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Auth/ForgotPassword.tsx b/packages/client-core/src/user/components/Auth/ForgotPassword.tsx index 5dba4cd542..03d404d80d 100755 --- a/packages/client-core/src/user/components/Auth/ForgotPassword.tsx +++ b/packages/client-core/src/user/components/Auth/ForgotPassword.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import Grid from '@xrengine/ui/src/Grid' -import TextField from '@xrengine/ui/src/TextField' -import Typography from '@xrengine/ui/src/Typography' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import Grid from '@etherealengine/ui/src/Grid' +import TextField from '@etherealengine/ui/src/TextField' +import Typography from '@etherealengine/ui/src/Typography' import { AuthService } from '../../services/AuthService' import styles from './index.module.scss' diff --git a/packages/client-core/src/user/components/Auth/Login.tsx b/packages/client-core/src/user/components/Auth/Login.tsx index c5fae8bb87..a23e6e98e3 100755 --- a/packages/client-core/src/user/components/Auth/Login.tsx +++ b/packages/client-core/src/user/components/Auth/Login.tsx @@ -1,9 +1,9 @@ import React, { Fragment, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Icon from '@xrengine/ui/src/Icon' -import Tab from '@xrengine/ui/src/Tab' -import Tabs from '@xrengine/ui/src/Tabs' +import Icon from '@etherealengine/ui/src/Icon' +import Tab from '@etherealengine/ui/src/Tab' +import Tabs from '@etherealengine/ui/src/Tabs' import { useAuthSettingState } from '../../../admin/services/Setting/AuthSettingService' import { initialAuthState } from '../../../common/initialAuthState' diff --git a/packages/client-core/src/user/components/Auth/MagicLinkEmail.tsx b/packages/client-core/src/user/components/Auth/MagicLinkEmail.tsx index 99c0151399..e9d079d854 100755 --- a/packages/client-core/src/user/components/Auth/MagicLinkEmail.tsx +++ b/packages/client-core/src/user/components/Auth/MagicLinkEmail.tsx @@ -2,14 +2,14 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' -import config from '@xrengine/common/src/config' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import Container from '@xrengine/ui/src/Container' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import Grid from '@xrengine/ui/src/Grid' -import TextField from '@xrengine/ui/src/TextField' -import Typography from '@xrengine/ui/src/Typography' +import config from '@etherealengine/common/src/config' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import Container from '@etherealengine/ui/src/Container' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import Grid from '@etherealengine/ui/src/Grid' +import TextField from '@etherealengine/ui/src/TextField' +import Typography from '@etherealengine/ui/src/Typography' import { useAuthSettingState } from '../../../admin/services/Setting/AuthSettingService' import { initialAuthState } from '../../../common/initialAuthState' diff --git a/packages/client-core/src/user/components/Auth/PasswordLogin.tsx b/packages/client-core/src/user/components/Auth/PasswordLogin.tsx index 09e6067204..e9045643f1 100755 --- a/packages/client-core/src/user/components/Auth/PasswordLogin.tsx +++ b/packages/client-core/src/user/components/Auth/PasswordLogin.tsx @@ -1,16 +1,16 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { dispatchAction } from '@xrengine/hyperflux' -import Avatar from '@xrengine/ui/src/Avatar' -import Button from '@xrengine/ui/src/Button' -import Checkbox from '@xrengine/ui/src/Checkbox' -import Container from '@xrengine/ui/src/Container' -import FormControlLabel from '@xrengine/ui/src/FormControlLabel' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import TextField from '@xrengine/ui/src/TextField' -import Typography from '@xrengine/ui/src/Typography' +import { dispatchAction } from '@etherealengine/hyperflux' +import Avatar from '@etherealengine/ui/src/Avatar' +import Button from '@etherealengine/ui/src/Button' +import Checkbox from '@etherealengine/ui/src/Checkbox' +import Container from '@etherealengine/ui/src/Container' +import FormControlLabel from '@etherealengine/ui/src/FormControlLabel' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import TextField from '@etherealengine/ui/src/TextField' +import Typography from '@etherealengine/ui/src/Typography' import { DialogAction } from '../../../common/services/DialogService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Auth/PasswordLoginApp.tsx b/packages/client-core/src/user/components/Auth/PasswordLoginApp.tsx index 8cbfc0dd07..b53f64b93b 100755 --- a/packages/client-core/src/user/components/Auth/PasswordLoginApp.tsx +++ b/packages/client-core/src/user/components/Auth/PasswordLoginApp.tsx @@ -1,13 +1,13 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import InputAdornment from '@xrengine/ui/src/InputAdornment' -import OutlinedInput from '@xrengine/ui/src/OutlinedInput' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import InputAdornment from '@etherealengine/ui/src/InputAdornment' +import OutlinedInput from '@etherealengine/ui/src/OutlinedInput' import { AuthService } from '../../services/AuthService' import styles from './index.module.scss' diff --git a/packages/client-core/src/user/components/Auth/Register.tsx b/packages/client-core/src/user/components/Auth/Register.tsx index 30be1fcbb3..49ad14f649 100755 --- a/packages/client-core/src/user/components/Auth/Register.tsx +++ b/packages/client-core/src/user/components/Auth/Register.tsx @@ -1,13 +1,13 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Avatar from '@xrengine/ui/src/Avatar' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import TextField from '@xrengine/ui/src/TextField' -import Typography from '@xrengine/ui/src/Typography' +import Avatar from '@etherealengine/ui/src/Avatar' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import TextField from '@etherealengine/ui/src/TextField' +import Typography from '@etherealengine/ui/src/Typography' import { AuthService } from '../../services/AuthService' import styles from './index.module.scss' diff --git a/packages/client-core/src/user/components/Auth/RegisterApp.tsx b/packages/client-core/src/user/components/Auth/RegisterApp.tsx index b816e1e2d3..4c2f1e66a6 100755 --- a/packages/client-core/src/user/components/Auth/RegisterApp.tsx +++ b/packages/client-core/src/user/components/Auth/RegisterApp.tsx @@ -1,14 +1,14 @@ import React, { useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import multiLogger from '@xrengine/common/src/logger' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import InputAdornment from '@xrengine/ui/src/InputAdornment' -import OutlinedInput from '@xrengine/ui/src/OutlinedInput' +import multiLogger from '@etherealengine/common/src/logger' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import InputAdornment from '@etherealengine/ui/src/InputAdornment' +import OutlinedInput from '@etherealengine/ui/src/OutlinedInput' import { AuthService } from '../../services/AuthService' import styles from './index.module.scss' diff --git a/packages/client-core/src/user/components/Auth/ResetPassword.tsx b/packages/client-core/src/user/components/Auth/ResetPassword.tsx index 8298ec931b..dfcf00b8d9 100755 --- a/packages/client-core/src/user/components/Auth/ResetPassword.tsx +++ b/packages/client-core/src/user/components/Auth/ResetPassword.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import TextField from '@xrengine/ui/src/TextField' -import Typography from '@xrengine/ui/src/Typography' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import TextField from '@etherealengine/ui/src/TextField' +import Typography from '@etherealengine/ui/src/Typography' import EmptyLayout from '../../../common/components/EmptyLayout' import styles from './index.module.scss' diff --git a/packages/client-core/src/user/components/Auth/ResetPasswordApp.tsx b/packages/client-core/src/user/components/Auth/ResetPasswordApp.tsx index 293522a92f..fd4fd929d1 100755 --- a/packages/client-core/src/user/components/Auth/ResetPasswordApp.tsx +++ b/packages/client-core/src/user/components/Auth/ResetPasswordApp.tsx @@ -1,13 +1,13 @@ import React, { useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import InputAdornment from '@xrengine/ui/src/InputAdornment' -import OutlinedInput from '@xrengine/ui/src/OutlinedInput' -import Typography from '@xrengine/ui/src/Typography' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import InputAdornment from '@etherealengine/ui/src/InputAdornment' +import OutlinedInput from '@etherealengine/ui/src/OutlinedInput' +import Typography from '@etherealengine/ui/src/Typography' import EmptyLayout from '../../../common/components/EmptyLayout' import { AuthService } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Auth/SocialLogin.tsx b/packages/client-core/src/user/components/Auth/SocialLogin.tsx index 56115c5e85..835bd5b513 100755 --- a/packages/client-core/src/user/components/Auth/SocialLogin.tsx +++ b/packages/client-core/src/user/components/Auth/SocialLogin.tsx @@ -2,10 +2,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' import { AuthService } from '../../services/AuthService' import styles from './index.module.scss' diff --git a/packages/client-core/src/user/components/Auth/VerifyEmail.tsx b/packages/client-core/src/user/components/Auth/VerifyEmail.tsx index 2d2d153a5e..6a306dbb7d 100755 --- a/packages/client-core/src/user/components/Auth/VerifyEmail.tsx +++ b/packages/client-core/src/user/components/Auth/VerifyEmail.tsx @@ -1,9 +1,9 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Box from '@xrengine/ui/src/Box' -import Container from '@xrengine/ui/src/Container' -import Typography from '@xrengine/ui/src/Typography' +import Box from '@etherealengine/ui/src/Box' +import Container from '@etherealengine/ui/src/Container' +import Typography from '@etherealengine/ui/src/Typography' import EmptyLayout from '../../../common/components/EmptyLayout' import { AuthService } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Login/index.tsx b/packages/client-core/src/user/components/Login/index.tsx index 0281cf8f9b..c246183645 100755 --- a/packages/client-core/src/user/components/Login/index.tsx +++ b/packages/client-core/src/user/components/Login/index.tsx @@ -2,10 +2,10 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import CardMedia from '@xrengine/ui/src/CardMedia' -import Icon from '@xrengine/ui/src/Icon' -import Typography from '@xrengine/ui/src/Typography' +import Button from '@etherealengine/ui/src/Button' +import CardMedia from '@etherealengine/ui/src/CardMedia' +import Icon from '@etherealengine/ui/src/Icon' +import Typography from '@etherealengine/ui/src/Typography' import Fab from '@mui/material/Fab' diff --git a/packages/client-core/src/user/components/MagicLink/AuthMagicLink.tsx b/packages/client-core/src/user/components/MagicLink/AuthMagicLink.tsx index e15b8f111e..dadf04d5b6 100755 --- a/packages/client-core/src/user/components/MagicLink/AuthMagicLink.tsx +++ b/packages/client-core/src/user/components/MagicLink/AuthMagicLink.tsx @@ -2,9 +2,9 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Box from '@xrengine/ui/src/Box' -import Container from '@xrengine/ui/src/Container' -import Typography from '@xrengine/ui/src/Typography' +import Box from '@etherealengine/ui/src/Box' +import Container from '@etherealengine/ui/src/Container' +import Typography from '@etherealengine/ui/src/Typography' import { AuthService } from '../../services/AuthService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Oauth/DiscordCallback.tsx b/packages/client-core/src/user/components/Oauth/DiscordCallback.tsx index 39f377bd4c..bedc7b6789 100755 --- a/packages/client-core/src/user/components/Oauth/DiscordCallback.tsx +++ b/packages/client-core/src/user/components/Oauth/DiscordCallback.tsx @@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' import { AuthService } from '../../services/AuthService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Oauth/FacebookCallback.tsx b/packages/client-core/src/user/components/Oauth/FacebookCallback.tsx index fb801a81e3..8e3480d406 100755 --- a/packages/client-core/src/user/components/Oauth/FacebookCallback.tsx +++ b/packages/client-core/src/user/components/Oauth/FacebookCallback.tsx @@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' import { AuthService } from '../../services/AuthService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Oauth/GithubCallback.tsx b/packages/client-core/src/user/components/Oauth/GithubCallback.tsx index 5761e93645..7e1da05ab6 100755 --- a/packages/client-core/src/user/components/Oauth/GithubCallback.tsx +++ b/packages/client-core/src/user/components/Oauth/GithubCallback.tsx @@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' import { AuthService } from '../../services/AuthService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Oauth/GoogleCallback.tsx b/packages/client-core/src/user/components/Oauth/GoogleCallback.tsx index 1171766698..f783e41350 100755 --- a/packages/client-core/src/user/components/Oauth/GoogleCallback.tsx +++ b/packages/client-core/src/user/components/Oauth/GoogleCallback.tsx @@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' import { AuthService } from '../../services/AuthService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Oauth/LinkedinCallBack.tsx b/packages/client-core/src/user/components/Oauth/LinkedinCallBack.tsx index 4826c72a69..a266ddb53d 100755 --- a/packages/client-core/src/user/components/Oauth/LinkedinCallBack.tsx +++ b/packages/client-core/src/user/components/Oauth/LinkedinCallBack.tsx @@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' import { AuthService } from '../../services/AuthService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Oauth/TwitterCallback.tsx b/packages/client-core/src/user/components/Oauth/TwitterCallback.tsx index 9a818a0512..5ca3fd4b3c 100755 --- a/packages/client-core/src/user/components/Oauth/TwitterCallback.tsx +++ b/packages/client-core/src/user/components/Oauth/TwitterCallback.tsx @@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Button from '@xrengine/ui/src/Button' -import Container from '@xrengine/ui/src/Container' +import Button from '@etherealengine/ui/src/Button' +import Container from '@etherealengine/ui/src/Container' import { AuthService } from '../../services/AuthService' import { useAuthState } from '../../services/AuthService' diff --git a/packages/client-core/src/user/components/Panel3D/helperFunctions.ts b/packages/client-core/src/user/components/Panel3D/helperFunctions.ts index 19f4894906..528961a8e1 100644 --- a/packages/client-core/src/user/components/Panel3D/helperFunctions.ts +++ b/packages/client-core/src/user/components/Panel3D/helperFunctions.ts @@ -1,15 +1,15 @@ import { t } from 'i18next' import { AnimationMixer, Box3, Camera, Mesh, Object3D, Scene, Vector3, WebGLRenderer } from 'three' -import { MAX_ALLOWED_TRIANGLES } from '@xrengine/common/src/constants/AvatarConstants' -import { AnimationComponent } from '@xrengine/engine/src/avatar/components/AnimationComponent' -import { AvatarAnimationComponent } from '@xrengine/engine/src/avatar/components/AvatarAnimationComponent' -import { loadAvatarModelAsset, setupAvatarModel } from '@xrengine/engine/src/avatar/functions/avatarFunctions' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { addObjectToGroup, removeGroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' +import { MAX_ALLOWED_TRIANGLES } from '@etherealengine/common/src/constants/AvatarConstants' +import { AnimationComponent } from '@etherealengine/engine/src/avatar/components/AnimationComponent' +import { AvatarAnimationComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent' +import { loadAvatarModelAsset, setupAvatarModel } from '@etherealengine/engine/src/avatar/functions/avatarFunctions' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { addObjectToGroup, removeGroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' export const validate = (obj: Object3D, renderer: WebGLRenderer, scene: Scene, camera: Camera) => { const objBoundingBox = new Box3().setFromObject(obj) diff --git a/packages/client-core/src/user/components/Panel3D/useRender3DPanelSystem.tsx b/packages/client-core/src/user/components/Panel3D/useRender3DPanelSystem.tsx index 34f5289896..5fda1274b7 100644 --- a/packages/client-core/src/user/components/Panel3D/useRender3DPanelSystem.tsx +++ b/packages/client-core/src/user/components/Panel3D/useRender3DPanelSystem.tsx @@ -1,16 +1,16 @@ import { useEffect } from 'react' import { DirectionalLight, HemisphereLight, PerspectiveCamera, Scene, sRGBEncoding, WebGLRenderer } from 'three' -import { useHookstateFromFactory } from '@xrengine/common/src/utils/useHookstateFromFactory' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity, removeEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { initSystems, unloadSystem } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { SystemUpdateType } from '@xrengine/engine/src/ecs/functions/SystemUpdateType' -import { getOrbitControls } from '@xrengine/engine/src/input/functions/loadOrbitControl' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' +import { useHookstateFromFactory } from '@etherealengine/common/src/utils/useHookstateFromFactory' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity, removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { initSystems, unloadSystem } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { SystemUpdateType } from '@etherealengine/engine/src/ecs/functions/SystemUpdateType' +import { getOrbitControls } from '@etherealengine/engine/src/input/functions/loadOrbitControl' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' const initialize3D = () => { const camera = new PerspectiveCamera(60, 1, 0.25, 20) diff --git a/packages/client-core/src/user/components/UserMenu/PopupMenuService.ts b/packages/client-core/src/user/components/UserMenu/PopupMenuService.ts index f1eae1ba68..2d4a247b0f 100644 --- a/packages/client-core/src/user/components/UserMenu/PopupMenuService.ts +++ b/packages/client-core/src/user/components/UserMenu/PopupMenuService.ts @@ -1,6 +1,6 @@ -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState, none } from '@xrengine/hyperflux' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState, none } from '@etherealengine/hyperflux' import { Views } from './util' diff --git a/packages/client-core/src/user/components/UserMenu/index.module.scss b/packages/client-core/src/user/components/UserMenu/index.module.scss index a0cb07a711..87e93ac4e1 100755 --- a/packages/client-core/src/user/components/UserMenu/index.module.scss +++ b/packages/client-core/src/user/components/UserMenu/index.module.scss @@ -1,4 +1,4 @@ -@import "@xrengine/client-core/src/styles/imports.module.scss"; +@import "@etherealengine/client-core/src/styles/imports.module.scss"; .menuContent { min-height: 220px; diff --git a/packages/client-core/src/user/components/UserMenu/index.tsx b/packages/client-core/src/user/components/UserMenu/index.tsx index 426f9238b0..b8eb4c0f46 100755 --- a/packages/client-core/src/user/components/UserMenu/index.tsx +++ b/packages/client-core/src/user/components/UserMenu/index.tsx @@ -7,8 +7,8 @@ import { NO_PROXY, removeActionReceptor, useHookstate -} from '@xrengine/hyperflux' -import IconButton from '@xrengine/ui/src/IconButton' +} from '@etherealengine/hyperflux' +import IconButton from '@etherealengine/ui/src/IconButton' import { Groups, Person } from '@mui/icons-material' import ClickAwayListener from '@mui/material/ClickAwayListener' diff --git a/packages/client-core/src/user/components/UserMenu/menus/AvatarContextMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/AvatarContextMenu.tsx index 8b1a8a3965..bf6b22bac9 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/AvatarContextMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/AvatarContextMenu.tsx @@ -2,17 +2,17 @@ import { useHookstate } from '@hookstate/core' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Avatar from '@xrengine/client-core/src/common/components/Avatar' -import Button from '@xrengine/client-core/src/common/components/Button' -import commonStyles from '@xrengine/client-core/src/common/components/common.module.scss' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import Text from '@xrengine/client-core/src/common/components/Text' -import { SendInvite } from '@xrengine/common/src/interfaces/Invite' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { getState } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' -import Chip from '@xrengine/ui/src/Chip' +import Avatar from '@etherealengine/client-core/src/common/components/Avatar' +import Button from '@etherealengine/client-core/src/common/components/Button' +import commonStyles from '@etherealengine/client-core/src/common/components/common.module.scss' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import Text from '@etherealengine/client-core/src/common/components/Text' +import { SendInvite } from '@etherealengine/common/src/interfaces/Invite' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { getState } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' +import Chip from '@etherealengine/ui/src/Chip' import { NotificationService } from '../../../../common/services/NotificationService' import { FriendService, useFriendState } from '../../../../social/services/FriendService' diff --git a/packages/client-core/src/user/components/UserMenu/menus/AvatarModifyMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/AvatarModifyMenu.tsx index 0c6fe71a38..fa3e301b2d 100644 --- a/packages/client-core/src/user/components/UserMenu/menus/AvatarModifyMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/AvatarModifyMenu.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import Avatar from '@xrengine/client-core/src/common/components/Avatar' -import AvatarPreview from '@xrengine/client-core/src/common/components/AvatarPreview' -import Button from '@xrengine/client-core/src/common/components/Button' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import InputFile from '@xrengine/client-core/src/common/components/InputFile' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import { isValidHttpUrl } from '@xrengine/client-core/src/common/utils' -import { getCanvasBlob } from '@xrengine/client-core/src/common/utils' +import Avatar from '@etherealengine/client-core/src/common/components/Avatar' +import AvatarPreview from '@etherealengine/client-core/src/common/components/AvatarPreview' +import Button from '@etherealengine/client-core/src/common/components/Button' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import InputFile from '@etherealengine/client-core/src/common/components/InputFile' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import { isValidHttpUrl } from '@etherealengine/client-core/src/common/utils' +import { getCanvasBlob } from '@etherealengine/client-core/src/common/utils' import { AVATAR_FILE_ALLOWED_EXTENSIONS, MAX_AVATAR_FILE_SIZE, @@ -19,14 +19,14 @@ import { THUMBNAIL_FILE_ALLOWED_EXTENSIONS, THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH -} from '@xrengine/common/src/constants/AvatarConstants' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import Box from '@xrengine/ui/src/Box' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +} from '@etherealengine/common/src/constants/AvatarConstants' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import Box from '@etherealengine/ui/src/Box' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { AvatarService } from '../../../services/AvatarService' import styles from '../index.module.scss' diff --git a/packages/client-core/src/user/components/UserMenu/menus/AvatarSelectMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/AvatarSelectMenu.tsx index e7de7ef153..37a52182b0 100644 --- a/packages/client-core/src/user/components/UserMenu/menus/AvatarSelectMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/AvatarSelectMenu.tsx @@ -1,19 +1,19 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Avatar from '@xrengine/client-core/src/common/components/Avatar' -import AvatarPreview from '@xrengine/client-core/src/common/components/AvatarPreview' -import Button from '@xrengine/client-core/src/common/components/Button' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import Text from '@xrengine/client-core/src/common/components/Text' -import { AvatarEffectComponent } from '@xrengine/engine/src/avatar/components/AvatarEffectComponent' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import Box from '@xrengine/ui/src/Box' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import Avatar from '@etherealengine/client-core/src/common/components/Avatar' +import AvatarPreview from '@etherealengine/client-core/src/common/components/AvatarPreview' +import Button from '@etherealengine/client-core/src/common/components/Button' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import Text from '@etherealengine/client-core/src/common/components/Text' +import { AvatarEffectComponent } from '@etherealengine/engine/src/avatar/components/AvatarEffectComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import Box from '@etherealengine/ui/src/Box' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { useAuthState } from '../../../services/AuthService' import { AvatarService, useAvatarService } from '../../../services/AvatarService' diff --git a/packages/client-core/src/user/components/UserMenu/menus/EmoteMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/EmoteMenu.tsx index 3ec9bff2b6..0f13f583b0 100644 --- a/packages/client-core/src/user/components/UserMenu/menus/EmoteMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/EmoteMenu.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useState } from 'react' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { changeAvatarAnimationState } from '@xrengine/engine/src/avatar/animation/AvatarAnimationGraph' -import { AvatarStates } from '@xrengine/engine/src/avatar/animation/Util' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import Button from '@xrengine/ui/src/Button' -import Icon from '@xrengine/ui/src/Icon' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { changeAvatarAnimationState } from '@etherealengine/engine/src/avatar/animation/AvatarAnimationGraph' +import { AvatarStates } from '@etherealengine/engine/src/avatar/animation/Util' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import Button from '@etherealengine/ui/src/Button' +import Icon from '@etherealengine/ui/src/Icon' import ClickAwayListener from '@mui/material/ClickAwayListener' diff --git a/packages/client-core/src/user/components/UserMenu/menus/FriendsMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/FriendsMenu.tsx index de4d643945..92e1b92da2 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/FriendsMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/FriendsMenu.tsx @@ -3,18 +3,18 @@ import { cloneDeep } from 'lodash' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Avatar from '@xrengine/client-core/src/common/components/Avatar' -import commonStyles from '@xrengine/client-core/src/common/components/common.module.scss' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import Tabs from '@xrengine/client-core/src/common/components/Tabs' -import Text from '@xrengine/client-core/src/common/components/Text' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { getState } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' -import Chip from '@xrengine/ui/src/Chip' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import Avatar from '@etherealengine/client-core/src/common/components/Avatar' +import commonStyles from '@etherealengine/client-core/src/common/components/common.module.scss' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import Tabs from '@etherealengine/client-core/src/common/components/Tabs' +import Text from '@etherealengine/client-core/src/common/components/Text' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { getState } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' +import Chip from '@etherealengine/ui/src/Chip' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { NotificationService } from '../../../../common/services/NotificationService' import { FriendService, useFriendState } from '../../../../social/services/FriendService' diff --git a/packages/client-core/src/user/components/UserMenu/menus/LocationMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/LocationMenu.tsx index b5bfb18bb7..663533f63f 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/LocationMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/LocationMenu.tsx @@ -2,18 +2,18 @@ import { Paginated } from '@feathersjs/feathers' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Location, LocationSeed } from '@xrengine/common/src/interfaces/Location' -import Button from '@xrengine/ui/src/Button' -import Icon from '@xrengine/ui/src/Icon' -import InputAdornment from '@xrengine/ui/src/InputAdornment' -import Table from '@xrengine/ui/src/Table' -import TableBody from '@xrengine/ui/src/TableBody' -import TableCell from '@xrengine/ui/src/TableCell' -import TableHead from '@xrengine/ui/src/TableHead' -import TablePagination from '@xrengine/ui/src/TablePagination' -import TableRow from '@xrengine/ui/src/TableRow' -import TextField from '@xrengine/ui/src/TextField' -import Typography from '@xrengine/ui/src/Typography' +import { Location, LocationSeed } from '@etherealengine/common/src/interfaces/Location' +import Button from '@etherealengine/ui/src/Button' +import Icon from '@etherealengine/ui/src/Icon' +import InputAdornment from '@etherealengine/ui/src/InputAdornment' +import Table from '@etherealengine/ui/src/Table' +import TableBody from '@etherealengine/ui/src/TableBody' +import TableCell from '@etherealengine/ui/src/TableCell' +import TableHead from '@etherealengine/ui/src/TableHead' +import TablePagination from '@etherealengine/ui/src/TablePagination' +import TableRow from '@etherealengine/ui/src/TableRow' +import TextField from '@etherealengine/ui/src/TextField' +import Typography from '@etherealengine/ui/src/Typography' import { API } from '../../../../API' import styles from '../index.module.scss' diff --git a/packages/client-core/src/user/components/UserMenu/menus/PartyMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/PartyMenu.tsx index 3b1f578d35..654e928d29 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/PartyMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/PartyMenu.tsx @@ -1,17 +1,17 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import Avatar from '@xrengine/client-core/src/common/components/Avatar' -import Button from '@xrengine/client-core/src/common/components/Button' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { CrownIcon } from '@xrengine/client-core/src/common/components/Icons/CrownIcon' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import Text from '@xrengine/client-core/src/common/components/Text' -import { SendInvite } from '@xrengine/common/src/interfaces/Invite' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' +import Avatar from '@etherealengine/client-core/src/common/components/Avatar' +import Button from '@etherealengine/client-core/src/common/components/Button' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { CrownIcon } from '@etherealengine/client-core/src/common/components/Icons/CrownIcon' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import Text from '@etherealengine/client-core/src/common/components/Text' +import { SendInvite } from '@etherealengine/common/src/interfaces/Invite' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' import { emailRegex, InviteService, phoneRegex } from '../../../../social/services/InviteService' import { PartyService, usePartyState } from '../../../../social/services/PartyService' diff --git a/packages/client-core/src/user/components/UserMenu/menus/ProfileMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/ProfileMenu.tsx index 76bdece6f9..c125acdd68 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/ProfileMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/ProfileMenu.tsx @@ -4,27 +4,27 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' -import Avatar from '@xrengine/client-core/src/common/components/Avatar' -import Button from '@xrengine/client-core/src/common/components/Button' -import commonStyles from '@xrengine/client-core/src/common/components/common.module.scss' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import { DiscordIcon } from '@xrengine/client-core/src/common/components/Icons/DiscordIcon' -import { FacebookIcon } from '@xrengine/client-core/src/common/components/Icons/FacebookIcon' -import { GoogleIcon } from '@xrengine/client-core/src/common/components/Icons/GoogleIcon' -import { LinkedInIcon } from '@xrengine/client-core/src/common/components/Icons/LinkedInIcon' -import { TwitterIcon } from '@xrengine/client-core/src/common/components/Icons/TwitterIcon' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import Text from '@xrengine/client-core/src/common/components/Text' -import { validateEmail, validatePhoneNumber } from '@xrengine/common/src/config' -// import { requestVcForEvent, vpRequestQuery } from '@xrengine/common/src/credentials/credentials' -import multiLogger from '@xrengine/common/src/logger' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { getState } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' -import CircularProgress from '@xrengine/ui/src/CircularProgress' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import Avatar from '@etherealengine/client-core/src/common/components/Avatar' +import Button from '@etherealengine/client-core/src/common/components/Button' +import commonStyles from '@etherealengine/client-core/src/common/components/common.module.scss' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import { DiscordIcon } from '@etherealengine/client-core/src/common/components/Icons/DiscordIcon' +import { FacebookIcon } from '@etherealengine/client-core/src/common/components/Icons/FacebookIcon' +import { GoogleIcon } from '@etherealengine/client-core/src/common/components/Icons/GoogleIcon' +import { LinkedInIcon } from '@etherealengine/client-core/src/common/components/Icons/LinkedInIcon' +import { TwitterIcon } from '@etherealengine/client-core/src/common/components/Icons/TwitterIcon' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import Text from '@etherealengine/client-core/src/common/components/Text' +import { validateEmail, validatePhoneNumber } from '@etherealengine/common/src/config' +// import { requestVcForEvent, vpRequestQuery } from '@etherealengine/common/src/credentials/credentials' +import multiLogger from '@etherealengine/common/src/logger' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { getState } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' +import CircularProgress from '@etherealengine/ui/src/CircularProgress' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { useAuthSettingState } from '../../../../admin/services/Setting/AuthSettingService' import { initialAuthState, initialOAuthConnectedState } from '../../../../common/initialAuthState' diff --git a/packages/client-core/src/user/components/UserMenu/menus/ReadyPlayerMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/ReadyPlayerMenu.tsx index 35618358db..46198f7073 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/ReadyPlayerMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/ReadyPlayerMenu.tsx @@ -1,17 +1,17 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import AvatarPreview from '@xrengine/client-core/src/common/components/AvatarPreview' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import { getCanvasBlob } from '@xrengine/client-core/src/common/utils' -import config from '@xrengine/common/src/config' -import { THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH } from '@xrengine/common/src/constants/AvatarConstants' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import AvatarPreview from '@etherealengine/client-core/src/common/components/AvatarPreview' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import { getCanvasBlob } from '@etherealengine/client-core/src/common/utils' +import config from '@etherealengine/common/src/config' +import { THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH } from '@etherealengine/common/src/constants/AvatarConstants' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { AVATAR_ID_REGEX, generateAvatarId } from '../../../../util/avatarIdFunctions' import { AvatarService } from '../../../services/AvatarService' diff --git a/packages/client-core/src/user/components/UserMenu/menus/RoomMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/RoomMenu.tsx index 2e45e7d9a8..f093c47deb 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/RoomMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/RoomMenu.tsx @@ -1,16 +1,16 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/client-core/src/common/components/Button' -import commonStyles from '@xrengine/client-core/src/common/components/common.module.scss' -import InputRadio from '@xrengine/client-core/src/common/components/InputRadio' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import { InstanceService } from '@xrengine/client-core/src/common/services/InstanceService' -import { useRouter } from '@xrengine/client-core/src/common/services/RouterService' -import { XRAction } from '@xrengine/engine/src/xr/XRState' -import { dispatchAction } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' +import Button from '@etherealengine/client-core/src/common/components/Button' +import commonStyles from '@etherealengine/client-core/src/common/components/common.module.scss' +import InputRadio from '@etherealengine/client-core/src/common/components/InputRadio' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import { InstanceService } from '@etherealengine/client-core/src/common/services/InstanceService' +import { useRouter } from '@etherealengine/client-core/src/common/services/RouterService' +import { XRAction } from '@etherealengine/engine/src/xr/XRState' +import { dispatchAction } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' import styles from '../index.module.scss' import { Views } from '../util' diff --git a/packages/client-core/src/user/components/UserMenu/menus/SettingMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/SettingMenu.tsx index a792b3b3e2..661f811b25 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/SettingMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/SettingMenu.tsx @@ -1,36 +1,36 @@ import React, { useLayoutEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/client-core/src/common/components/Button' -import InputCheck from '@xrengine/client-core/src/common/components/InputCheck' -import InputSelect, { InputMenuItem } from '@xrengine/client-core/src/common/components/InputSelect' -import InputSlider from '@xrengine/client-core/src/common/components/InputSlider' -import InputSwitch from '@xrengine/client-core/src/common/components/InputSwitch' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import Tabs from '@xrengine/client-core/src/common/components/Tabs' -import Text from '@xrengine/client-core/src/common/components/Text' -import { AuthService, useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { defaultThemeModes, defaultThemeSettings } from '@xrengine/common/src/constants/DefaultThemeSettings' -import capitalizeFirstLetter from '@xrengine/common/src/utils/capitalizeFirstLetter' -import { AudioSettingAction, useAudioState } from '@xrengine/engine/src/audio/AudioState' +import Button from '@etherealengine/client-core/src/common/components/Button' +import InputCheck from '@etherealengine/client-core/src/common/components/InputCheck' +import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/common/components/InputSelect' +import InputSlider from '@etherealengine/client-core/src/common/components/InputSlider' +import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import Tabs from '@etherealengine/client-core/src/common/components/Tabs' +import Text from '@etherealengine/client-core/src/common/components/Text' +import { AuthService, useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { defaultThemeModes, defaultThemeSettings } from '@etherealengine/common/src/constants/DefaultThemeSettings' +import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter' +import { AudioSettingAction, useAudioState } from '@etherealengine/engine/src/audio/AudioState' import { AvatarAxesControlScheme, AvatarInputSettingsAction, AvatarInputSettingsState -} from '@xrengine/engine/src/avatar/state/AvatarInputSettingsState' -import { isMobile } from '@xrengine/engine/src/common/functions/isMobile' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { RendererState } from '@xrengine/engine/src/renderer/RendererState' +} from '@etherealengine/engine/src/avatar/state/AvatarInputSettingsState' +import { isMobile } from '@etherealengine/engine/src/common/functions/isMobile' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { RendererState } from '@etherealengine/engine/src/renderer/RendererState' import { getPostProcessingSceneMetadataState, PostProcessingSceneMetadataLabel -} from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { XRState } from '@xrengine/engine/src/xr/XRState' -import { dispatchAction, getState, useHookstate } from '@xrengine/hyperflux' -import Box from '@xrengine/ui/src/Box' -import Collapse from '@xrengine/ui/src/Collapse' -import Grid from '@xrengine/ui/src/Grid' -import Icon from '@xrengine/ui/src/Icon' +} from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { XRState } from '@etherealengine/engine/src/xr/XRState' +import { dispatchAction, getState, useHookstate } from '@etherealengine/hyperflux' +import Box from '@etherealengine/ui/src/Box' +import Collapse from '@etherealengine/ui/src/Collapse' +import Grid from '@etherealengine/ui/src/Grid' +import Icon from '@etherealengine/ui/src/Icon' import { useClientSettingState } from '../../../../admin/services/Setting/ClientSettingService' import { userHasAccess } from '../../../userHasAccess' diff --git a/packages/client-core/src/user/components/UserMenu/menus/ShareMenu.tsx b/packages/client-core/src/user/components/UserMenu/menus/ShareMenu.tsx index 45acef37f4..27fb004770 100755 --- a/packages/client-core/src/user/components/UserMenu/menus/ShareMenu.tsx +++ b/packages/client-core/src/user/components/UserMenu/menus/ShareMenu.tsx @@ -2,19 +2,19 @@ import { QRCodeSVG } from 'qrcode.react' import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import Button from '@xrengine/client-core/src/common/components/Button' -import { OculusIcon } from '@xrengine/client-core/src/common/components/Icons/OculusIcon' -import InputCheck from '@xrengine/client-core/src/common/components/InputCheck' -import InputText from '@xrengine/client-core/src/common/components/InputText' -import Menu from '@xrengine/client-core/src/common/components/Menu' -import { NotificationService } from '@xrengine/client-core/src/common/services/NotificationService' -import { SendInvite } from '@xrengine/common/src/interfaces/Invite' -import multiLogger from '@xrengine/common/src/logger' -import { isShareAvailable } from '@xrengine/engine/src/common/functions/DetectFeatures' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import Box from '@xrengine/ui/src/Box' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' +import Button from '@etherealengine/client-core/src/common/components/Button' +import { OculusIcon } from '@etherealengine/client-core/src/common/components/Icons/OculusIcon' +import InputCheck from '@etherealengine/client-core/src/common/components/InputCheck' +import InputText from '@etherealengine/client-core/src/common/components/InputText' +import Menu from '@etherealengine/client-core/src/common/components/Menu' +import { NotificationService } from '@etherealengine/client-core/src/common/services/NotificationService' +import { SendInvite } from '@etherealengine/common/src/interfaces/Invite' +import multiLogger from '@etherealengine/common/src/logger' +import { isShareAvailable } from '@etherealengine/engine/src/common/functions/DetectFeatures' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import Box from '@etherealengine/ui/src/Box' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' import { emailRegex, InviteService, phoneRegex } from '../../../../social/services/InviteService' import { useAuthState } from '../../../services/AuthService' diff --git a/packages/client-core/src/user/components/UserMenu/util.tsx b/packages/client-core/src/user/components/UserMenu/util.tsx index e6cfe1cf40..fc1caf0988 100755 --- a/packages/client-core/src/user/components/UserMenu/util.tsx +++ b/packages/client-core/src/user/components/UserMenu/util.tsx @@ -1,6 +1,6 @@ -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { AvatarProps } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { State } from '@xrengine/hyperflux/functions/StateFunctions' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { AvatarProps } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { State } from '@etherealengine/hyperflux/functions/StateFunctions' export const Views = { Closed: '', diff --git a/packages/client-core/src/user/functions/useRoomCodeURLParam.ts b/packages/client-core/src/user/functions/useRoomCodeURLParam.ts index b3ca34d1b3..ac9d5d70ba 100644 --- a/packages/client-core/src/user/functions/useRoomCodeURLParam.ts +++ b/packages/client-core/src/user/functions/useRoomCodeURLParam.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getState } from '@xrengine/hyperflux' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getState } from '@etherealengine/hyperflux' import { LocationInstanceState, useWorldInstance } from '../../common/services/LocationInstanceConnectionService' diff --git a/packages/client-core/src/user/functions/userPatched.ts b/packages/client-core/src/user/functions/userPatched.ts index e3d17f6e2b..bf6b2f7db4 100644 --- a/packages/client-core/src/user/functions/userPatched.ts +++ b/packages/client-core/src/user/functions/userPatched.ts @@ -1,11 +1,11 @@ import { t } from 'i18next' -import { resolveUser } from '@xrengine/common/src/interfaces/User' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { resolveUser } from '@etherealengine/common/src/interfaces/User' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { LocationInstanceConnectionAction } from '../../common/services/LocationInstanceConnectionService' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/user/services/AuthService.ts b/packages/client-core/src/user/services/AuthService.ts index 9b502198ba..c3078c3f6a 100755 --- a/packages/client-core/src/user/services/AuthService.ts +++ b/packages/client-core/src/user/services/AuthService.ts @@ -5,21 +5,21 @@ import querystring from 'querystring' import { useEffect } from 'react' import { v1 } from 'uuid' -import { validateEmail, validatePhoneNumber } from '@xrengine/common/src/config' -import config from '@xrengine/common/src/config' -import { AuthStrategies } from '@xrengine/common/src/interfaces/AuthStrategies' -import { AuthUser, AuthUserSeed, resolveAuthUser } from '@xrengine/common/src/interfaces/AuthUser' -import { IdentityProvider } from '@xrengine/common/src/interfaces/IdentityProvider' +import { validateEmail, validatePhoneNumber } from '@etherealengine/common/src/config' +import config from '@etherealengine/common/src/config' +import { AuthStrategies } from '@etherealengine/common/src/interfaces/AuthStrategies' +import { AuthUser, AuthUserSeed, resolveAuthUser } from '@etherealengine/common/src/interfaces/AuthUser' +import { IdentityProvider } from '@etherealengine/common/src/interfaces/IdentityProvider' import { resolveUser, resolveWalletUser, UserInterface, UserSeed, UserSetting -} from '@xrengine/common/src/interfaces/User' -import { UserApiKey } from '@xrengine/common/src/interfaces/UserApiKey' -import multiLogger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' +} from '@etherealengine/common/src/interfaces/User' +import { UserApiKey } from '@etherealengine/common/src/interfaces/UserApiKey' +import multiLogger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' import { defineAction, defineState, @@ -27,7 +27,7 @@ import { getState, syncStateWithLocalStorage, useState -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/user/services/AvatarService.ts b/packages/client-core/src/user/services/AvatarService.ts index d7e06865df..12cc4e56d6 100644 --- a/packages/client-core/src/user/services/AvatarService.ts +++ b/packages/client-core/src/user/services/AvatarService.ts @@ -2,12 +2,12 @@ import { Paginated } from '@feathersjs/feathers' import axios from 'axios' import i18n from 'i18next' -import config from '@xrengine/common/src/config' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { WorldNetworkAction } from '@xrengine/engine/src/networking/functions/WorldNetworkAction' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import config from '@etherealengine/common/src/config' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { WorldNetworkAction } from '@etherealengine/engine/src/networking/functions/WorldNetworkAction' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { NotificationService } from '../../common/services/NotificationService' diff --git a/packages/client-core/src/user/services/NetworkUserService.ts b/packages/client-core/src/user/services/NetworkUserService.ts index 42cd8a1aa6..2e77a63f5a 100644 --- a/packages/client-core/src/user/services/NetworkUserService.ts +++ b/packages/client-core/src/user/services/NetworkUserService.ts @@ -1,10 +1,10 @@ import { Paginated } from '@feathersjs/feathers' import { none } from '@hookstate/core' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' diff --git a/packages/client-core/src/util/upload.tsx b/packages/client-core/src/util/upload.tsx index ab9f4ea4e8..d04d449ccd 100644 --- a/packages/client-core/src/util/upload.tsx +++ b/packages/client-core/src/util/upload.tsx @@ -1,7 +1,7 @@ import i18n from 'i18next' -import config from '@xrengine/common/src/config' -import { dispatchAction } from '@xrengine/hyperflux' +import config from '@etherealengine/common/src/config' +import { dispatchAction } from '@etherealengine/hyperflux' import { FileBrowserAction } from '../common/services/FileBrowserService' import { accessAuthState } from '../user/services/AuthService' diff --git a/packages/client-core/src/world/ClientModules.ts b/packages/client-core/src/world/ClientModules.ts index b2a649bd18..a4342c3b6a 100644 --- a/packages/client-core/src/world/ClientModules.ts +++ b/packages/client-core/src/world/ClientModules.ts @@ -1,19 +1,19 @@ -import { MediaModule } from '@xrengine/engine/src/audio/MediaModule' -import { AvatarClientModule } from '@xrengine/engine/src/avatar/AvatarClientModule' -import { AvatarCommonModule } from '@xrengine/engine/src/avatar/AvatarCommonModule' -import { CameraModule } from '@xrengine/engine/src/camera/CameraModule' -import { DebugModule } from '@xrengine/engine/src/debug/DebugModule' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { initSystems } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { InputModule } from '@xrengine/engine/src/input/InputModule' -import { InteractionModule } from '@xrengine/engine/src/interaction/InteractionModule' -import { RealtimeNetworkingModule } from '@xrengine/engine/src/networking/RealtimeNetworkingModule' -import { RendererModule } from '@xrengine/engine/src/renderer/RendererModule' -import { SceneClientModule } from '@xrengine/engine/src/scene/SceneClientModule' -import { SceneCommonModule } from '@xrengine/engine/src/scene/SceneCommonModule' -import { TransformModule } from '@xrengine/engine/src/transform/TransformModule' -import { XRModule } from '@xrengine/engine/src/xr/XRModule' -import { XRUIModule } from '@xrengine/engine/src/xrui/XRUIModule' +import { MediaModule } from '@etherealengine/engine/src/audio/MediaModule' +import { AvatarClientModule } from '@etherealengine/engine/src/avatar/AvatarClientModule' +import { AvatarCommonModule } from '@etherealengine/engine/src/avatar/AvatarCommonModule' +import { CameraModule } from '@etherealengine/engine/src/camera/CameraModule' +import { DebugModule } from '@etherealengine/engine/src/debug/DebugModule' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { initSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { InputModule } from '@etherealengine/engine/src/input/InputModule' +import { InteractionModule } from '@etherealengine/engine/src/interaction/InteractionModule' +import { RealtimeNetworkingModule } from '@etherealengine/engine/src/networking/RealtimeNetworkingModule' +import { RendererModule } from '@etherealengine/engine/src/renderer/RendererModule' +import { SceneClientModule } from '@etherealengine/engine/src/scene/SceneClientModule' +import { SceneCommonModule } from '@etherealengine/engine/src/scene/SceneCommonModule' +import { TransformModule } from '@etherealengine/engine/src/transform/TransformModule' +import { XRModule } from '@etherealengine/engine/src/xr/XRModule' +import { XRUIModule } from '@etherealengine/engine/src/xrui/XRUIModule' export function ClientModules() { return initSystems(Engine.instance.currentWorld, [ diff --git a/packages/client-core/src/world/DefaultLocationSystems.ts b/packages/client-core/src/world/DefaultLocationSystems.ts index b8f40afd88..2eb2c228e0 100644 --- a/packages/client-core/src/world/DefaultLocationSystems.ts +++ b/packages/client-core/src/world/DefaultLocationSystems.ts @@ -1,4 +1,4 @@ -import { SystemModuleType } from '@xrengine/engine/src/ecs/functions/SystemFunctions' +import { SystemModuleType } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' import WebcamInputSystem from '../media/webcam/WebcamInput' import AvatarUISystem from '../systems/AvatarUISystem' diff --git a/packages/client-core/src/world/services/SceneService.ts b/packages/client-core/src/world/services/SceneService.ts index de3fd30aec..9b8ce614d5 100755 --- a/packages/client-core/src/world/services/SceneService.ts +++ b/packages/client-core/src/world/services/SceneService.ts @@ -1,9 +1,9 @@ import { useEffect } from 'react' -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { updateSceneFromJSON } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { updateSceneFromJSON } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { API } from '../../API' import { accessLocationState } from '../../social/services/LocationService' diff --git a/packages/client-core/tests/setup.js b/packages/client-core/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/client-core/tests/setup.js +++ b/packages/client-core/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/client-core/tests/user/AuthService.test.ts b/packages/client-core/tests/user/AuthService.test.ts index d46df83c37..33d845f9fa 100644 --- a/packages/client-core/tests/user/AuthService.test.ts +++ b/packages/client-core/tests/user/AuthService.test.ts @@ -2,8 +2,8 @@ import assert from 'assert' // import { accessAuthState, AuthAction, avatarFetchedReceptor } from '../../src/user/services/AuthService' // make browser globals defined -// import { createEngine, setupEngineActionSystems } from '@xrengine/engine/src/initializeEngine' -// import { Downgraded } from '@xrengine/hyperflux/functions/StateFunctions' +// import { createEngine, setupEngineActionSystems } from '@etherealengine/engine/src/initializeEngine' +// import { Downgraded } from '@etherealengine/hyperflux/functions/StateFunctions' // ;(globalThis as any).document = {} // ;(globalThis as any).navigator = {} diff --git a/packages/client/LICENSE b/packages/client/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/client/LICENSE +++ b/packages/client/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/client/android/app/build.gradle b/packages/client/android/app/build.gradle index 1db8557718..640e665126 100755 --- a/packages/client/android/app/build.gradle +++ b/packages/client/android/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "com.xrengine.client" + applicationId "org.etherealengine.client" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/packages/client/android/app/src/main/AndroidManifest.xml b/packages/client/android/app/src/main/AndroidManifest.xml index ded4ec23fe..a5589c915b 100755 --- a/packages/client/android/app/src/main/AndroidManifest.xml +++ b/packages/client/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.etherealengine.client"> diff --git a/packages/client/android/app/src/main/assets/capacitor.config.json b/packages/client/android/app/src/main/assets/capacitor.config.json index f09080a9b5..edad14ec44 100755 --- a/packages/client/android/app/src/main/assets/capacitor.config.json +++ b/packages/client/android/app/src/main/assets/capacitor.config.json @@ -1,6 +1,6 @@ { - "appId": "com.xrengine.client", - "appName": "@xrengine/client", + "appId": "org.etherealengine.client", + "appName": "@etherealengine/client", "bundledWebRuntime": false, "npmClient": "npm", "webDir": "www", diff --git a/packages/client/android/app/src/main/java/com/xrengine/client/MainActivity.java b/packages/client/android/app/src/main/java/com/xrengine/client/MainActivity.java index 15ed1d77e9..1f5f0834c0 100755 --- a/packages/client/android/app/src/main/java/com/xrengine/client/MainActivity.java +++ b/packages/client/android/app/src/main/java/com/xrengine/client/MainActivity.java @@ -1,7 +1,7 @@ -package com.xrengine.client; +package org.etherealengine.client; import android.os.Bundle; -import com.xrengine.xr.XRPlugin; +import org.etherealengine.xr.XRPlugin; import com.getcapacitor.BridgeActivity; import com.getcapacitor.Plugin; diff --git a/packages/client/android/app/src/main/res/values/strings.xml b/packages/client/android/app/src/main/res/values/strings.xml index 2a05d879d6..c7c27a85cf 100755 --- a/packages/client/android/app/src/main/res/values/strings.xml +++ b/packages/client/android/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - @xrengine/client - @xrengine/client - com.xrengine.client - com.xrengine.client + @etherealengine/client + @etherealengine/client + org.etherealengine.client + org.etherealengine.client diff --git a/packages/client/capacitor.config.json b/packages/client/capacitor.config.json index f09080a9b5..edad14ec44 100755 --- a/packages/client/capacitor.config.json +++ b/packages/client/capacitor.config.json @@ -1,6 +1,6 @@ { - "appId": "com.xrengine.client", - "appName": "@xrengine/client", + "appId": "org.etherealengine.client", + "appName": "@etherealengine/client", "bundledWebRuntime": false, "npmClient": "npm", "webDir": "www", diff --git a/packages/client/i18n/en/translation.json b/packages/client/i18n/en/translation.json index 70b38cab30..b6d330a02f 100755 --- a/packages/client/i18n/en/translation.json +++ b/packages/client/i18n/en/translation.json @@ -76,20 +76,5 @@ "xr": "XR", "foundation": "Foundation", "description": "FREE, OPEN, & INTEROPERABLE IMMERSIVE WEB TECHNOLOGY" - }, - "xrengineContact": { - "header": "Get In Touch!", - "description": "We’d love to help you with your virtual events, digital retail, entertainment and other needs.", - "lbl-name": "Name", - "lbl-email": "Email", - "lbl-company": "Company", - "lbl-project": "Describe your Project", - "lbl-send": "Send", - "lbl-ok": "Ok", - "lbl-success": "Message Sent, We'll get back to you shortly.", - "lbl-failure": "An error occured, Plese try again", - "err-username": "Please enter you name.", - "err-email": "Email is require.", - "err-msg": "Provide some brief description of your project." } } diff --git a/packages/client/ios/App/App.xcodeproj/project.pbxproj b/packages/client/ios/App/App.xcodeproj/project.pbxproj index ec281cea53..ea96d199ae 100755 --- a/packages/client/ios/App/App.xcodeproj/project.pbxproj +++ b/packages/client/ios/App/App.xcodeproj/project.pbxproj @@ -350,7 +350,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; - PRODUCT_BUNDLE_IDENTIFIER = com.xrengine.client; + PRODUCT_BUNDLE_IDENTIFIER = org.etherealengine.client; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH"; SWIFT_VERSION = 5.0; @@ -367,7 +367,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.xrengine.client; + PRODUCT_BUNDLE_IDENTIFIER = org.etherealengine.client; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH; SWIFT_VERSION = 5.0; diff --git a/packages/client/ios/App/App/Info.plist b/packages/client/ios/App/App/Info.plist index 22752a255e..50ce65a47c 100755 --- a/packages/client/ios/App/App/Info.plist +++ b/packages/client/ios/App/App/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - @xrengine/client + @etherealengine/client CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/packages/client/ios/App/App/capacitor.config.json b/packages/client/ios/App/App/capacitor.config.json index f09080a9b5..edad14ec44 100755 --- a/packages/client/ios/App/App/capacitor.config.json +++ b/packages/client/ios/App/App/capacitor.config.json @@ -1,6 +1,6 @@ { - "appId": "com.xrengine.client", - "appName": "@xrengine/client", + "appId": "org.etherealengine.client", + "appName": "@etherealengine/client", "bundledWebRuntime": false, "npmClient": "npm", "webDir": "www", diff --git a/packages/client/package.json b/packages/client/package.json index d5fbff4415..4e5cfdca9c 100755 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,10 +1,10 @@ { - "name": "@xrengine/client", + "name": "@etherealengine/client", "version": "1.1.3", "private": true, "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "engines": { "node": ">= 18.12.0" @@ -39,13 +39,13 @@ "@mui/styled-engine-sc": "5.11.0", "@originjs/vite-plugin-commonjs": "^1.0.3", "@swc/core": "^1.2.210", - "@xrengine/client-core": "^1.1.3", - "@xrengine/common": "^1.1.3", - "@xrengine/editor": "^1.1.3", - "@xrengine/engine": "^1.1.3", - "@xrengine/hyperflux": "^1.1.3", - "@xrengine/matchmaking": "^1.1.3", - "@xrengine/projects": "^1.1.3", + "@etherealengine/client-core": "^1.1.3", + "@etherealengine/common": "^1.1.3", + "@etherealengine/editor": "^1.1.3", + "@etherealengine/engine": "^1.1.3", + "@etherealengine/hyperflux": "^1.1.3", + "@etherealengine/matchmaking": "^1.1.3", + "@etherealengine/projects": "^1.1.3", "app-root-path": "3.0.0", "classnames": "2.3.1", "cli": "1.0.1", diff --git a/packages/client/public/static/etherealengine_thumbnail.jpg b/packages/client/public/static/etherealengine_thumbnail.jpg new file mode 100644 index 0000000000..a2b5c5dc93 Binary files /dev/null and b/packages/client/public/static/etherealengine_thumbnail.jpg differ diff --git a/packages/client/public/static/xrengine.png b/packages/client/public/static/xrengine.png deleted file mode 100755 index 517085a11e..0000000000 Binary files a/packages/client/public/static/xrengine.png and /dev/null differ diff --git a/packages/client/scripts/getClientSettings.ts b/packages/client/scripts/getClientSettings.ts index ab51a0bf27..e8d8c63a0a 100644 --- a/packages/client/scripts/getClientSettings.ts +++ b/packages/client/scripts/getClientSettings.ts @@ -4,7 +4,7 @@ export const getClientSetting = async () => { const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql', @@ -75,7 +75,7 @@ export const getClientSetting = async () => { icon512px: dbClient.icon512px }) || { logo: './logo.svg', - title: 'XREngine', + title: 'Ethereal Engine', url: 'https://local.etherealengine.com', releaseName: 'local', siteDescription: 'Connected Worlds for Everyone', diff --git a/packages/client/scripts/populate-assetlinks.ts b/packages/client/scripts/populate-assetlinks.ts index 754168d3d7..105444736f 100644 --- a/packages/client/scripts/populate-assetlinks.ts +++ b/packages/client/scripts/populate-assetlinks.ts @@ -3,7 +3,7 @@ import cli from 'cli' import fs from 'fs' import fetch from 'node-fetch' -import { writeFileSyncRecursive } from '@xrengine/server-core/src/util/fsHelperFunctions' +import { writeFileSyncRecursive } from '@etherealengine/server-core/src/util/fsHelperFunctions' const envPath = appRootPath.path + `/packages/client/public/.wellknown/assetlinks.json` diff --git a/packages/client/src/engine.tsx b/packages/client/src/engine.tsx index cd0d7175a9..e952d6e0cd 100755 --- a/packages/client/src/engine.tsx +++ b/packages/client/src/engine.tsx @@ -1,11 +1,11 @@ import React, { createRef, lazy, Suspense } from 'react' import { useTranslation } from 'react-i18next' -import { API } from '@xrengine/client-core/src/API' -import { FullscreenContainer } from '@xrengine/client-core/src/components/FullscreenContainer' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { createEngine, initializeBrowser, setupEngineActionSystems } from '@xrengine/engine/src/initializeEngine' +import { API } from '@etherealengine/client-core/src/API' +import { FullscreenContainer } from '@etherealengine/client-core/src/components/FullscreenContainer' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { createEngine, initializeBrowser, setupEngineActionSystems } from '@etherealengine/engine/src/initializeEngine' import { initializei18n } from './util' diff --git a/packages/client/src/main.tsx b/packages/client/src/main.tsx index 1e6284840b..edc29412b7 100755 --- a/packages/client/src/main.tsx +++ b/packages/client/src/main.tsx @@ -2,7 +2,7 @@ import { t } from 'i18next' import React, { lazy, Suspense } from 'react' import { createRoot } from 'react-dom/client' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' //@ts-ignore +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' //@ts-ignore ;(globalThis as any).process = { env: { ...(import.meta as any).env, APP_ENV: (import.meta as any).env.MODE } } diff --git a/packages/client/src/pages/_app.tsx b/packages/client/src/pages/_app.tsx index fd35958156..9daf726414 100755 --- a/packages/client/src/pages/_app.tsx +++ b/packages/client/src/pages/_app.tsx @@ -6,18 +6,18 @@ import { BrowserRouter, useLocation } from 'react-router-dom' import { ClientSettingService, useClientSettingState -} from '@xrengine/client-core/src/admin/services/Setting/ClientSettingService' -import { initGA, logPageView } from '@xrengine/client-core/src/common/analytics' -import MetaTags from '@xrengine/client-core/src/common/components/MetaTags' -import { defaultAction } from '@xrengine/client-core/src/common/components/NotificationActions' -import { ProjectService, useProjectState } from '@xrengine/client-core/src/common/services/ProjectService' -import InviteToast from '@xrengine/client-core/src/components/InviteToast' -import { theme } from '@xrengine/client-core/src/theme' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import GlobalStyle from '@xrengine/client-core/src/util/GlobalStyle' -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { loadWebappInjection } from '@xrengine/projects/loadWebappInjection' +} from '@etherealengine/client-core/src/admin/services/Setting/ClientSettingService' +import { initGA, logPageView } from '@etherealengine/client-core/src/common/analytics' +import MetaTags from '@etherealengine/client-core/src/common/components/MetaTags' +import { defaultAction } from '@etherealengine/client-core/src/common/components/NotificationActions' +import { ProjectService, useProjectState } from '@etherealengine/client-core/src/common/services/ProjectService' +import InviteToast from '@etherealengine/client-core/src/components/InviteToast' +import { theme } from '@etherealengine/client-core/src/theme' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import GlobalStyle from '@etherealengine/client-core/src/util/GlobalStyle' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { loadWebappInjection } from '@etherealengine/projects/loadWebappInjection' import { StyledEngineProvider, Theme, ThemeProvider } from '@mui/material/styles' @@ -28,27 +28,30 @@ import './styles.scss' import { AdminCoilSettingService, useCoilSettingState -} from '@xrengine/client-core/src/admin/services/Setting/CoilSettingService' -import { API } from '@xrengine/client-core/src/API' -import UIDialog from '@xrengine/client-core/src/common/components/UIDialog' +} from '@etherealengine/client-core/src/admin/services/Setting/CoilSettingService' +import { API } from '@etherealengine/client-core/src/API' +import UIDialog from '@etherealengine/client-core/src/common/components/UIDialog' import { AppThemeServiceReceptor, AppThemeState, getAppTheme, getAppThemeName, useAppThemeName -} from '@xrengine/client-core/src/common/services/AppThemeState' -import { NotificationAction, NotificationActions } from '@xrengine/client-core/src/common/services/NotificationService' +} from '@etherealengine/client-core/src/common/services/AppThemeState' +import { + NotificationAction, + NotificationActions +} from '@etherealengine/client-core/src/common/services/NotificationService' import { OEmbedService, OEmbedServiceReceptor, useOEmbedState -} from '@xrengine/client-core/src/common/services/OEmbedService' -import Debug from '@xrengine/client-core/src/components/Debug' -import config from '@xrengine/common/src/config' -import { getCurrentTheme } from '@xrengine/common/src/constants/DefaultThemeSettings' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { addActionReceptor, getState, removeActionReceptor, useHookstate } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/common/services/OEmbedService' +import Debug from '@etherealengine/client-core/src/components/Debug' +import config from '@etherealengine/common/src/config' +import { getCurrentTheme } from '@etherealengine/common/src/constants/DefaultThemeSettings' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { addActionReceptor, getState, removeActionReceptor, useHookstate } from '@etherealengine/hyperflux' declare module '@mui/styles/defaultTheme' { // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/packages/client/src/pages/admin.tsx b/packages/client/src/pages/admin.tsx index 3db568add7..685892672d 100755 --- a/packages/client/src/pages/admin.tsx +++ b/packages/client/src/pages/admin.tsx @@ -3,22 +3,22 @@ import { SnackbarProvider } from 'notistack' import React, { createRef, useCallback, useEffect, useRef, useState } from 'react' import { BrowserRouter, useLocation } from 'react-router-dom' -import AdminRoutes from '@xrengine/client-core/src/admin/adminRoutes' +import AdminRoutes from '@etherealengine/client-core/src/admin/adminRoutes' import { ClientSettingService, useClientSettingState -} from '@xrengine/client-core/src/admin/services/Setting/ClientSettingService' -import { initGA, logPageView } from '@xrengine/client-core/src/common/analytics' -import MetaTags from '@xrengine/client-core/src/common/components/MetaTags' -import { defaultAction } from '@xrengine/client-core/src/common/components/NotificationActions' -import { ProjectService, useProjectState } from '@xrengine/client-core/src/common/services/ProjectService' -import InviteToast from '@xrengine/client-core/src/components/InviteToast' -import { theme } from '@xrengine/client-core/src/theme' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import GlobalStyle from '@xrengine/client-core/src/util/GlobalStyle' -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { loadWebappInjection } from '@xrengine/projects/loadWebappInjection' +} from '@etherealengine/client-core/src/admin/services/Setting/ClientSettingService' +import { initGA, logPageView } from '@etherealengine/client-core/src/common/analytics' +import MetaTags from '@etherealengine/client-core/src/common/components/MetaTags' +import { defaultAction } from '@etherealengine/client-core/src/common/components/NotificationActions' +import { ProjectService, useProjectState } from '@etherealengine/client-core/src/common/services/ProjectService' +import InviteToast from '@etherealengine/client-core/src/components/InviteToast' +import { theme } from '@etherealengine/client-core/src/theme' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import GlobalStyle from '@etherealengine/client-core/src/util/GlobalStyle' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { loadWebappInjection } from '@etherealengine/projects/loadWebappInjection' import { StyledEngineProvider, Theme, ThemeProvider } from '@mui/material/styles' @@ -27,27 +27,30 @@ import './styles.scss' import { AdminCoilSettingService, useCoilSettingState -} from '@xrengine/client-core/src/admin/services/Setting/CoilSettingService' -import { API } from '@xrengine/client-core/src/API' -import UIDialog from '@xrengine/client-core/src/common/components/UIDialog' +} from '@etherealengine/client-core/src/admin/services/Setting/CoilSettingService' +import { API } from '@etherealengine/client-core/src/API' +import UIDialog from '@etherealengine/client-core/src/common/components/UIDialog' import { AppThemeServiceReceptor, AppThemeState, getAppTheme, getAppThemeName, useAppThemeName -} from '@xrengine/client-core/src/common/services/AppThemeState' -import { NotificationAction, NotificationActions } from '@xrengine/client-core/src/common/services/NotificationService' +} from '@etherealengine/client-core/src/common/services/AppThemeState' +import { + NotificationAction, + NotificationActions +} from '@etherealengine/client-core/src/common/services/NotificationService' import { OEmbedService, OEmbedServiceReceptor, useOEmbedState -} from '@xrengine/client-core/src/common/services/OEmbedService' -import Debug from '@xrengine/client-core/src/components/Debug' -import config from '@xrengine/common/src/config' -import { getCurrentTheme } from '@xrengine/common/src/constants/DefaultThemeSettings' -import { AudioEffectPlayer } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { addActionReceptor, getState, removeActionReceptor, useHookstate } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/common/services/OEmbedService' +import Debug from '@etherealengine/client-core/src/components/Debug' +import config from '@etherealengine/common/src/config' +import { getCurrentTheme } from '@etherealengine/common/src/constants/DefaultThemeSettings' +import { AudioEffectPlayer } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { addActionReceptor, getState, removeActionReceptor, useHookstate } from '@etherealengine/hyperflux' declare module '@mui/styles/defaultTheme' { // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/packages/client/src/pages/auth/authRoutes.tsx b/packages/client/src/pages/auth/authRoutes.tsx index d0d1ac3dae..95813bbb37 100644 --- a/packages/client/src/pages/auth/authRoutes.tsx +++ b/packages/client/src/pages/auth/authRoutes.tsx @@ -2,7 +2,7 @@ import { t } from 'i18next' import React, { Suspense } from 'react' import { Route, Routes } from 'react-router-dom' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' import $confirm from './confirm' import $forgotpassword from './forgotpassword' diff --git a/packages/client/src/pages/auth/confirm.tsx b/packages/client/src/pages/auth/confirm.tsx index d5fcf1e3a5..9a8cb6d65c 100755 --- a/packages/client/src/pages/auth/confirm.tsx +++ b/packages/client/src/pages/auth/confirm.tsx @@ -1,6 +1,6 @@ import React from 'react' -import ConfirmEmail from '@xrengine/client-core/src/user/components/Auth/ConfirmEmail' +import ConfirmEmail from '@etherealengine/client-core/src/user/components/Auth/ConfirmEmail' export const ConfirmEmailPage = () => diff --git a/packages/client/src/pages/auth/forgotpassword.tsx b/packages/client/src/pages/auth/forgotpassword.tsx index 96622eac34..30027c1aed 100755 --- a/packages/client/src/pages/auth/forgotpassword.tsx +++ b/packages/client/src/pages/auth/forgotpassword.tsx @@ -1,6 +1,6 @@ import React from 'react' -import ForgotPassword from '@xrengine/client-core/src/user/components/Auth/ForgotPassword' +import ForgotPassword from '@etherealengine/client-core/src/user/components/Auth/ForgotPassword' export const ForgotPasswordPage = () => diff --git a/packages/client/src/pages/auth/magiclink.tsx b/packages/client/src/pages/auth/magiclink.tsx index 3a89daa15d..abfb39a449 100755 --- a/packages/client/src/pages/auth/magiclink.tsx +++ b/packages/client/src/pages/auth/magiclink.tsx @@ -1,6 +1,6 @@ import React from 'react' -import AuthMagicLink from '@xrengine/client-core/src/user/components/MagicLink/AuthMagicLink' +import AuthMagicLink from '@etherealengine/client-core/src/user/components/MagicLink/AuthMagicLink' export const AuthMagicLinkPage = () => diff --git a/packages/client/src/pages/auth/oauth/discord.tsx b/packages/client/src/pages/auth/oauth/discord.tsx index 2513b4cf5e..b580f598d2 100755 --- a/packages/client/src/pages/auth/oauth/discord.tsx +++ b/packages/client/src/pages/auth/oauth/discord.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { DiscordCallback } from '@xrengine/client-core/src/user/components/Oauth/DiscordCallback' +import { DiscordCallback } from '@etherealengine/client-core/src/user/components/Oauth/DiscordCallback' export const DiscordHomePage = () => diff --git a/packages/client/src/pages/auth/oauth/facebook.tsx b/packages/client/src/pages/auth/oauth/facebook.tsx index bf4dced20a..566c099192 100755 --- a/packages/client/src/pages/auth/oauth/facebook.tsx +++ b/packages/client/src/pages/auth/oauth/facebook.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { FacebookCallback } from '@xrengine/client-core/src/user/components/Oauth/FacebookCallback' +import { FacebookCallback } from '@etherealengine/client-core/src/user/components/Oauth/FacebookCallback' export const FacebookHomePage = () => diff --git a/packages/client/src/pages/auth/oauth/github.tsx b/packages/client/src/pages/auth/oauth/github.tsx index a2f8ad0afd..2184d2c9f6 100755 --- a/packages/client/src/pages/auth/oauth/github.tsx +++ b/packages/client/src/pages/auth/oauth/github.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { GithubCallback } from '@xrengine/client-core/src/user/components/Oauth/GithubCallback' +import { GithubCallback } from '@etherealengine/client-core/src/user/components/Oauth/GithubCallback' export const GithubHomePage = () => diff --git a/packages/client/src/pages/auth/oauth/google.tsx b/packages/client/src/pages/auth/oauth/google.tsx index ca98ec381b..2625f87486 100755 --- a/packages/client/src/pages/auth/oauth/google.tsx +++ b/packages/client/src/pages/auth/oauth/google.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { GoogleCallback } from '@xrengine/client-core/src/user/components/Oauth/GoogleCallback' +import { GoogleCallback } from '@etherealengine/client-core/src/user/components/Oauth/GoogleCallback' export const GoogleHomePage = () => diff --git a/packages/client/src/pages/auth/oauth/linkedin.tsx b/packages/client/src/pages/auth/oauth/linkedin.tsx index e1d0fec8cf..6e1c66d842 100755 --- a/packages/client/src/pages/auth/oauth/linkedin.tsx +++ b/packages/client/src/pages/auth/oauth/linkedin.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { LinkedinCallback } from '@xrengine/client-core/src/user/components/Oauth/LinkedinCallBack' +import { LinkedinCallback } from '@etherealengine/client-core/src/user/components/Oauth/LinkedinCallBack' export const LinkedInHomePage = () => diff --git a/packages/client/src/pages/auth/oauth/twitter.tsx b/packages/client/src/pages/auth/oauth/twitter.tsx index ed3d2c4ad1..b58b6ce588 100755 --- a/packages/client/src/pages/auth/oauth/twitter.tsx +++ b/packages/client/src/pages/auth/oauth/twitter.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { TwitterCallback } from '@xrengine/client-core/src/user/components/Oauth/TwitterCallback' +import { TwitterCallback } from '@etherealengine/client-core/src/user/components/Oauth/TwitterCallback' export const TwitterHomePage = () => diff --git a/packages/client/src/pages/editor/editor.tsx b/packages/client/src/pages/editor/editor.tsx index f96695b356..1ef635de6d 100644 --- a/packages/client/src/pages/editor/editor.tsx +++ b/packages/client/src/pages/editor/editor.tsx @@ -1,10 +1,10 @@ import { t } from 'i18next' import React, { Suspense } from 'react' -import FormDialog from '@xrengine/client-core/src/admin/common/SubmitDialog' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import { userHasAccessHook } from '@xrengine/client-core/src/user/userHasAccess' -import ProjectEditor from '@xrengine/editor/src/pages/editor' +import FormDialog from '@etherealengine/client-core/src/admin/common/SubmitDialog' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import { userHasAccessHook } from '@etherealengine/client-core/src/user/userHasAccess' +import ProjectEditor from '@etherealengine/editor/src/pages/editor' const EditorProtectedRoutes = () => { const isSceneAllowed = userHasAccessHook('editor:write') diff --git a/packages/client/src/pages/index.tsx b/packages/client/src/pages/index.tsx index acad186fdb..f807fcf6ab 100755 --- a/packages/client/src/pages/index.tsx +++ b/packages/client/src/pages/index.tsx @@ -2,14 +2,14 @@ import React, { Fragment, useEffect, useState } from 'react' import { Trans, useTranslation } from 'react-i18next' import { Navigate } from 'react-router-dom' -import { useClientSettingState } from '@xrengine/client-core/src/admin/services/Setting/ClientSettingService' -import styles from '@xrengine/client-core/src/admin/styles/admin.module.scss' -import MetaTags from '@xrengine/client-core/src/common/components/MetaTags' -import { NotificationService } from '@xrengine/client-core/src/common/services/NotificationService' -import ProfileMenu from '@xrengine/client-core/src/user/components/UserMenu/menus/ProfileMenu' -import SettingMenu from '@xrengine/client-core/src/user/components/UserMenu/menus/SettingMenu' -import { Views } from '@xrengine/client-core/src/user/components/UserMenu/util' -import config from '@xrengine/common/src/config' +import { useClientSettingState } from '@etherealengine/client-core/src/admin/services/Setting/ClientSettingService' +import styles from '@etherealengine/client-core/src/admin/styles/admin.module.scss' +import MetaTags from '@etherealengine/client-core/src/common/components/MetaTags' +import { NotificationService } from '@etherealengine/client-core/src/common/services/NotificationService' +import ProfileMenu from '@etherealengine/client-core/src/user/components/UserMenu/menus/ProfileMenu' +import SettingMenu from '@etherealengine/client-core/src/user/components/UserMenu/menus/SettingMenu' +import { Views } from '@etherealengine/client-core/src/user/components/UserMenu/util' +import config from '@etherealengine/common/src/config' import { Box, Button } from '@mui/material' diff --git a/packages/client/src/pages/location/[locationName].tsx b/packages/client/src/pages/location/[locationName].tsx index e33fa4cf05..f7b5ba9cc5 100755 --- a/packages/client/src/pages/location/[locationName].tsx +++ b/packages/client/src/pages/location/[locationName].tsx @@ -2,19 +2,19 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { useLocation, useParams } from 'react-router-dom' -import { AppLoadingState } from '@xrengine/client-core/src/common/services/AppLoadingService' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import { LocationIcons } from '@xrengine/client-core/src/components/LocationIcons' -import { LoadEngineWithScene } from '@xrengine/client-core/src/components/World/LoadEngineWithScene' -import LoadLocationScene from '@xrengine/client-core/src/components/World/LoadLocationScene' -import NetworkInstanceProvisioning from '@xrengine/client-core/src/components/World/NetworkInstanceProvisioning' -import { OfflineLocation } from '@xrengine/client-core/src/components/World/OfflineLocation' -import { FriendService } from '@xrengine/client-core/src/social/services/FriendService' -import { LocationAction, useLocationState } from '@xrengine/client-core/src/social/services/LocationService' -import { AuthService } from '@xrengine/client-core/src/user/services/AuthService' -import { DefaultLocationSystems } from '@xrengine/client-core/src/world/DefaultLocationSystems' -import { SceneService } from '@xrengine/client-core/src/world/services/SceneService' -import { dispatchAction, getState, useHookstate, useState } from '@xrengine/hyperflux' +import { AppLoadingState } from '@etherealengine/client-core/src/common/services/AppLoadingService' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import { LocationIcons } from '@etherealengine/client-core/src/components/LocationIcons' +import { LoadEngineWithScene } from '@etherealengine/client-core/src/components/World/LoadEngineWithScene' +import LoadLocationScene from '@etherealengine/client-core/src/components/World/LoadLocationScene' +import NetworkInstanceProvisioning from '@etherealengine/client-core/src/components/World/NetworkInstanceProvisioning' +import { OfflineLocation } from '@etherealengine/client-core/src/components/World/OfflineLocation' +import { FriendService } from '@etherealengine/client-core/src/social/services/FriendService' +import { LocationAction, useLocationState } from '@etherealengine/client-core/src/social/services/LocationService' +import { AuthService } from '@etherealengine/client-core/src/user/services/AuthService' +import { DefaultLocationSystems } from '@etherealengine/client-core/src/world/DefaultLocationSystems' +import { SceneService } from '@etherealengine/client-core/src/world/services/SceneService' +import { dispatchAction, getState, useHookstate, useState } from '@etherealengine/hyperflux' const LocationPage = () => { const { t } = useTranslation() diff --git a/packages/client/src/pages/location/location.tsx b/packages/client/src/pages/location/location.tsx index 3918d2e36c..a2901eb04e 100644 --- a/packages/client/src/pages/location/location.tsx +++ b/packages/client/src/pages/location/location.tsx @@ -2,7 +2,7 @@ import { t } from 'i18next' import React, { lazy, Suspense } from 'react' import { Route, Routes } from 'react-router-dom' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' const LocationPage = lazy(() => import('./[locationName]')) diff --git a/packages/client/src/pages/offline/[locationName].tsx b/packages/client/src/pages/offline/[locationName].tsx index 48b2aa0a68..11ba6ac76e 100755 --- a/packages/client/src/pages/offline/[locationName].tsx +++ b/packages/client/src/pages/offline/[locationName].tsx @@ -2,15 +2,15 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { useParams } from 'react-router-dom' -import { AppLoadingState } from '@xrengine/client-core/src/common/services/AppLoadingService' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import { LocationIcons } from '@xrengine/client-core/src/components/LocationIcons' -import { LoadEngineWithScene } from '@xrengine/client-core/src/components/World/LoadEngineWithScene' -import { OfflineLocation } from '@xrengine/client-core/src/components/World/OfflineLocation' -import { LocationAction } from '@xrengine/client-core/src/social/services/LocationService' -import { DefaultLocationSystems } from '@xrengine/client-core/src/world/DefaultLocationSystems' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { dispatchAction, getState, useHookstate } from '@xrengine/hyperflux' +import { AppLoadingState } from '@etherealengine/client-core/src/common/services/AppLoadingService' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import { LocationIcons } from '@etherealengine/client-core/src/components/LocationIcons' +import { LoadEngineWithScene } from '@etherealengine/client-core/src/components/World/LoadEngineWithScene' +import { OfflineLocation } from '@etherealengine/client-core/src/components/World/OfflineLocation' +import { LocationAction } from '@etherealengine/client-core/src/social/services/LocationService' +import { DefaultLocationSystems } from '@etherealengine/client-core/src/world/DefaultLocationSystems' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { dispatchAction, getState, useHookstate } from '@etherealengine/hyperflux' import { loadSceneJsonOffline } from './utils' diff --git a/packages/client/src/pages/offline/offline.tsx b/packages/client/src/pages/offline/offline.tsx index e8bc35dcb6..a9d03818d2 100644 --- a/packages/client/src/pages/offline/offline.tsx +++ b/packages/client/src/pages/offline/offline.tsx @@ -2,7 +2,7 @@ import { t } from 'i18next' import React, { lazy, Suspense, useEffect } from 'react' import { Navigate, Route, Routes } from 'react-router-dom' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' const LocationPage = lazy(() => import('./[locationName]')) diff --git a/packages/client/src/pages/offline/utils.ts b/packages/client/src/pages/offline/utils.ts index 5934f83750..dfaf4aa0c1 100644 --- a/packages/client/src/pages/offline/utils.ts +++ b/packages/client/src/pages/offline/utils.ts @@ -1,7 +1,7 @@ -import { SceneActions } from '@xrengine/client-core/src/world/services/SceneService' -import config from '@xrengine/common/src/config' -import { SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { dispatchAction } from '@xrengine/hyperflux' +import { SceneActions } from '@etherealengine/client-core/src/world/services/SceneService' +import config from '@etherealengine/common/src/config' +import { SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { dispatchAction } from '@etherealengine/hyperflux' const sceneRelativePathIdentifier = '__$project$__' const sceneCorsPathIdentifier = '__$cors-proxy$__' diff --git a/packages/client/src/pages/room.tsx b/packages/client/src/pages/room.tsx index 93fe2c9680..3328be1401 100755 --- a/packages/client/src/pages/room.tsx +++ b/packages/client/src/pages/room.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { useClientSettingState } from '@xrengine/client-core/src/admin/services/Setting/ClientSettingService' -import MetaTags from '@xrengine/client-core/src/common/components/MetaTags' -import RoomMenu from '@xrengine/client-core/src/user/components/UserMenu/menus/RoomMenu' +import { useClientSettingState } from '@etherealengine/client-core/src/admin/services/Setting/ClientSettingService' +import MetaTags from '@etherealengine/client-core/src/common/components/MetaTags' +import RoomMenu from '@etherealengine/client-core/src/user/components/UserMenu/menus/RoomMenu' import Box from '@mui/material/Box' diff --git a/packages/client/src/pages/styles.scss b/packages/client/src/pages/styles.scss index 436a1b1293..1c8822828d 100755 --- a/packages/client/src/pages/styles.scss +++ b/packages/client/src/pages/styles.scss @@ -1,4 +1,4 @@ -@import "@xrengine/client-core/src/styles/imports.module.scss"; +@import "@etherealengine/client-core/src/styles/imports.module.scss"; .credential-mediator { pointer-events: auto; diff --git a/packages/client/src/route/customRoutes.tsx b/packages/client/src/route/customRoutes.tsx index c40c602b90..85cfa4e9ec 100644 --- a/packages/client/src/route/customRoutes.tsx +++ b/packages/client/src/route/customRoutes.tsx @@ -2,7 +2,7 @@ import { t } from 'i18next' import React, { Suspense } from 'react' import { Route, Routes, useLocation } from 'react-router-dom' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' const CustomRoutes = ({ customRoutes }) => { if (customRoutes === null) return diff --git a/packages/client/src/route/getCustomRoutes.ts b/packages/client/src/route/getCustomRoutes.ts index dfe45bd3b2..b11c743c17 100644 --- a/packages/client/src/route/getCustomRoutes.ts +++ b/packages/client/src/route/getCustomRoutes.ts @@ -1,8 +1,8 @@ import i18n from 'i18next' import { lazy } from 'react' -import { API } from '@xrengine/client-core/src/API' -import { loadRoute } from '@xrengine/projects/loadRoute' +import { API } from '@etherealengine/client-core/src/API' +import { loadRoute } from '@etherealengine/projects/loadRoute' export type CustomRoute = { route: string diff --git a/packages/client/src/route/public.tsx b/packages/client/src/route/public.tsx index c1ec0378d8..1c00862628 100644 --- a/packages/client/src/route/public.tsx +++ b/packages/client/src/route/public.tsx @@ -6,35 +6,39 @@ import { AuthSettingsService, AuthSettingsServiceReceptor, useAuthSettingState -} from '@xrengine/client-core/src/admin/services/Setting/AuthSettingService' +} from '@etherealengine/client-core/src/admin/services/Setting/AuthSettingService' import { ClientSettingsServiceReceptor, useClientSettingState -} from '@xrengine/client-core/src/admin/services/Setting/ClientSettingService' -import ErrorBoundary from '@xrengine/client-core/src/common/components/ErrorBoundary' -import { AppLoadingServiceReceptor } from '@xrengine/client-core/src/common/services/AppLoadingService' -import { AppServiceReceptor } from '@xrengine/client-core/src/common/services/AppService' -import { DialogServiceReceptor } from '@xrengine/client-core/src/common/services/DialogService' -import { MediaInstanceConnectionServiceReceptor } from '@xrengine/client-core/src/common/services/MediaInstanceConnectionService' -import { ProjectServiceReceptor } from '@xrengine/client-core/src/common/services/ProjectService' -import { RouterServiceReceptor, RouterState, useRouter } from '@xrengine/client-core/src/common/services/RouterService' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import { FriendServiceReceptor } from '@xrengine/client-core/src/social/services/FriendService' -import { InviteService, InviteServiceReceptor } from '@xrengine/client-core/src/social/services/InviteService' -import { LocationServiceReceptor } from '@xrengine/client-core/src/social/services/LocationService' -import { AuthService, AuthServiceReceptor } from '@xrengine/client-core/src/user/services/AuthService' -import { AvatarServiceReceptor } from '@xrengine/client-core/src/user/services/AvatarService' -import { addActionReceptor, getState, removeActionReceptor, useHookstate } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/admin/services/Setting/ClientSettingService' +import ErrorBoundary from '@etherealengine/client-core/src/common/components/ErrorBoundary' +import { AppLoadingServiceReceptor } from '@etherealengine/client-core/src/common/services/AppLoadingService' +import { AppServiceReceptor } from '@etherealengine/client-core/src/common/services/AppService' +import { DialogServiceReceptor } from '@etherealengine/client-core/src/common/services/DialogService' +import { MediaInstanceConnectionServiceReceptor } from '@etherealengine/client-core/src/common/services/MediaInstanceConnectionService' +import { ProjectServiceReceptor } from '@etherealengine/client-core/src/common/services/ProjectService' +import { + RouterServiceReceptor, + RouterState, + useRouter +} from '@etherealengine/client-core/src/common/services/RouterService' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import { FriendServiceReceptor } from '@etherealengine/client-core/src/social/services/FriendService' +import { InviteService, InviteServiceReceptor } from '@etherealengine/client-core/src/social/services/InviteService' +import { LocationServiceReceptor } from '@etherealengine/client-core/src/social/services/LocationService' +import { AuthService, AuthServiceReceptor } from '@etherealengine/client-core/src/user/services/AuthService' +import { AvatarServiceReceptor } from '@etherealengine/client-core/src/user/services/AvatarService' +import { addActionReceptor, getState, removeActionReceptor, useHookstate } from '@etherealengine/hyperflux' import $404 from '../pages/404' import $503 from '../pages/503' import { CustomRoute, getCustomRoutes } from './getCustomRoutes' -const $index = lazy(() => import('@xrengine/client/src/pages')) -const $auth = lazy(() => import('@xrengine/client/src/pages/auth/authRoutes')) -const $offline = lazy(() => import('@xrengine/client/src/pages/offline/offline')) -const $custom = lazy(() => import('@xrengine/client/src/route/customRoutes')) -const $admin = lazy(() => import('@xrengine/client-core/src/admin/adminRoutes')) +const $index = lazy(() => import('@etherealengine/client/src/pages')) +const $auth = lazy(() => import('@etherealengine/client/src/pages/auth/authRoutes')) +const $offline = lazy(() => import('@etherealengine/client/src/pages/offline/offline')) +const $custom = lazy(() => import('@etherealengine/client/src/route/customRoutes')) +const $admin = lazy(() => import('@etherealengine/client-core/src/admin/adminRoutes')) function RouterComp() { const [customRoutes, setCustomRoutes] = useState(null as any as CustomRoute[]) diff --git a/packages/client/src/util.ts b/packages/client/src/util.ts index 1916a73c42..29d338a8c6 100755 --- a/packages/client/src/util.ts +++ b/packages/client/src/util.ts @@ -3,8 +3,8 @@ import LanguageDetector from 'i18next-browser-languagedetector' import { merge } from 'lodash' import { initReactI18next } from 'react-i18next' -import getClientCoreI18nConfigs from '@xrengine/client-core/src/i18n' -import { getI18nConfigs } from '@xrengine/client-core/src/i18nImporter' +import getClientCoreI18nConfigs from '@etherealengine/client-core/src/i18n' +import { getI18nConfigs } from '@etherealengine/client-core/src/i18nImporter' //@ts-ignore const projects = import.meta.glob('../../projects/projects/**/i18n/**/*.json', { eager: true }) diff --git a/packages/client/tests/setup.js b/packages/client/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/client/tests/setup.js +++ b/packages/client/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts index 3fc8a68619..e44316c0c4 100755 --- a/packages/client/vite.config.ts +++ b/packages/client/vite.config.ts @@ -72,7 +72,7 @@ export default defineConfig(async () => { const returned = { optimizeDeps: { - exclude: ['@xrfoundation/volumetric'], + exclude: ['@etherealengine/volumetric'], include: ['@reactflow/core', '@reactflow/minimap', '@reactflow/controls', '@reactflow/background'], esbuildOptions: { target: 'es2020' @@ -84,7 +84,7 @@ export default defineConfig(async () => { createHtmlPlugin({ inject: { data: { - title: clientSetting.title || 'XRENGINE', + title: clientSetting.title || 'Ethereal Engine', appleTouchIcon: clientSetting.appleTouchIcon || '/apple-touch-icon.png', favicon32px: clientSetting.favicon32px || '/favicon-32x32.png', favicon16px: clientSetting.favicon16px || '/favicon-16x16.png', diff --git a/packages/common/.ctirc b/packages/common/.ctirc deleted file mode 100644 index d78b605933..0000000000 --- a/packages/common/.ctirc +++ /dev/null @@ -1,36 +0,0 @@ -{ - addNewline: true, - excludes: [ - '@types', - 'typings', - '__test__', - '__tests__', - 'node_modules', - ], - fileExcludePatterns: [], - fileFirst: true, - globOptions: { - cwd: 'D:\\Projects\\xr3ngine\\packages\\engine', - dot: true, - ignore: [ - '@types/**', - 'typings/**', - '__test__/**', - '__tests__/**', - 'node_modules/**', - ], - nonull: true, - }, - includeCWD: true, - output: 'index.ts', - quote: "'", - targetExts: [ - 'ts', - 'tsx', - ], - useSemicolon: false, - useTimestamp: false, - verbose: false, - withoutBackupFile: true, - withoutComment: true, -} diff --git a/packages/common/LICENSE b/packages/common/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/common/LICENSE +++ b/packages/common/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/common/package.json b/packages/common/package.json index 183b1f1e3f..983a6f63e5 100755 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,5 +1,5 @@ { - "name": "@xrengine/common", + "name": "@etherealengine/common", "version": "1.1.3", "main": "lib/common.umd.js", "module": "lib/common.es.js", @@ -7,14 +7,13 @@ "publishConfig": { "access": "public" }, - "description": "Shared types for other XREngine packages", + "description": "Shared types for other Ethereal Engine packages", "scripts": { "check-errors": "tsc --noemit", - "test": "mocha --jobs 1", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "test": "mocha --jobs 1" }, - "repository": "http://github.com/XRFoundation/XREngine", - "author": "XREngine", + "repository": "http://github.com/etherealengine/etherealengine", + "author": "Ethereal Engine", "license": "MIT", "dependencies": { "@digitalbazaar/did-method-key": "^3.0.0", diff --git a/packages/common/scripts/update-name-gh-package.js b/packages/common/scripts/update-name-gh-package.js deleted file mode 100644 index b3443f81a0..0000000000 --- a/packages/common/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/common'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/common/src/constants/BotUserAgent.ts b/packages/common/src/constants/BotUserAgent.ts index 4982a8c9f7..bfa69c2649 100644 --- a/packages/common/src/constants/BotUserAgent.ts +++ b/packages/common/src/constants/BotUserAgent.ts @@ -1 +1 @@ -export const BotUserAgent = 'XREngine Puppeteer' +export const BotUserAgent = 'Ethereal Engine Puppeteer' diff --git a/packages/common/src/credentials/credentials.ts b/packages/common/src/credentials/credentials.ts index d6b956044c..355b4de21b 100644 --- a/packages/common/src/credentials/credentials.ts +++ b/packages/common/src/credentials/credentials.ts @@ -2,7 +2,7 @@ import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020 import vcjs from '@digitalcredentials/vc' import axios from 'axios' -import { securityLoader } from '@xrengine/common/src/documentLoader' +import { securityLoader } from '@etherealengine/common/src/documentLoader' import { VerifiablePresentation } from '../interfaces/Web5' import multiLogger from '../logger' diff --git a/packages/common/src/logger.ts b/packages/common/src/logger.ts index 32d87385a3..adc6a48943 100644 --- a/packages/common/src/logger.ts +++ b/packages/common/src/logger.ts @@ -46,7 +46,7 @@ const multiLogger = { /** * Usage: * - * import multiLogger from '@xrengine/common/src/logger' + * import multiLogger from '@etherealengine/common/src/logger' * const logger = multiLogger.child({ component: 'client-core:authentication' }) * * logger.info('Logging in...') diff --git a/packages/common/tests/setup.js b/packages/common/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/common/tests/setup.js +++ b/packages/common/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/editor/.ctirc b/packages/editor/.ctirc deleted file mode 100644 index d78b605933..0000000000 --- a/packages/editor/.ctirc +++ /dev/null @@ -1,36 +0,0 @@ -{ - addNewline: true, - excludes: [ - '@types', - 'typings', - '__test__', - '__tests__', - 'node_modules', - ], - fileExcludePatterns: [], - fileFirst: true, - globOptions: { - cwd: 'D:\\Projects\\xr3ngine\\packages\\engine', - dot: true, - ignore: [ - '@types/**', - 'typings/**', - '__test__/**', - '__tests__/**', - 'node_modules/**', - ], - nonull: true, - }, - includeCWD: true, - output: 'index.ts', - quote: "'", - targetExts: [ - 'ts', - 'tsx', - ], - useSemicolon: false, - useTimestamp: false, - verbose: false, - withoutBackupFile: true, - withoutComment: true, -} diff --git a/packages/editor/LICENSE.md b/packages/editor/LICENSE.md index 1b7b428559..4668c95039 100755 --- a/packages/editor/LICENSE.md +++ b/packages/editor/LICENSE.md @@ -1,10 +1,10 @@ ==================================================================== ==================================================================== -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine codebase are derived from other projects. +All original work by the Ethereal Engine team is subject to MIT license. -The XREngine editor began as a Typescript conversion of Spoke, +The Ethereal Engine editor began as a Typescript conversion of Spoke, created and maintained by Robert Long at Mozilla, and licensed under the Mozilla Public License Version 2.0. https://github.com/mozilla/Spoke @@ -17,7 +17,7 @@ project (https://github.com/mrdoob/three.js/), licensed under the MIT License. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2022 Ethereal Engine Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/editor/package.json b/packages/editor/package.json index e6944ae254..62736a9a4e 100755 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,12 +1,12 @@ { - "name": "@xrengine/editor", + "name": "@etherealengine/editor", "version": "1.1.3", "main": "lib/editor.umd.js", "module": "lib/editor.es.js", "types": "lib/index.d.ts", "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "engines": { "node": ">= 18.12.0" @@ -17,8 +17,7 @@ "npmClient": "npm", "scripts": { "check-errors": "tsc --noemit", - "test": "mocha --config .mocharc.js", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "test": "mocha --config .mocharc.js" }, "resolutions": { "@types/react": "18.0.19", @@ -36,10 +35,10 @@ "@mui/icons-material": "5.11.0", "@mui/material": "5.11.0", "@mui/styles": "5.11.0", - "@xrengine/client-core": "^1.1.3", - "@xrengine/common": "^1.1.3", - "@xrengine/engine": "^1.1.3", - "@xrengine/hyperflux": "^1.1.3", + "@etherealengine/client-core": "^1.1.3", + "@etherealengine/common": "^1.1.3", + "@etherealengine/engine": "^1.1.3", + "@etherealengine/hyperflux": "^1.1.3", "axios": "0.26.1", "behave-graph": "^0.9.9", "classnames": "2.3.1", diff --git a/packages/editor/scripts/update-name-gh-package.js b/packages/editor/scripts/update-name-gh-package.js deleted file mode 100644 index 7dd55e250c..0000000000 --- a/packages/editor/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/editor'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/editor/src/classes/EditorCameraComponent.ts b/packages/editor/src/classes/EditorCameraComponent.ts index da5f72652c..f3c3e9eb73 100644 --- a/packages/editor/src/classes/EditorCameraComponent.ts +++ b/packages/editor/src/classes/EditorCameraComponent.ts @@ -1,7 +1,7 @@ import { Vector3 } from 'three' -import { createMappedComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID } from '@xrengine/engine/src/ecs/functions/EntityTree' +import { createMappedComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID } from '@etherealengine/engine/src/ecs/functions/EntityTree' export type EditorCameraComponentType = { center: Vector3 diff --git a/packages/editor/src/classes/MeshCombinationGroup.ts b/packages/editor/src/classes/MeshCombinationGroup.ts index 6da00ad223..40baef9090 100755 --- a/packages/editor/src/classes/MeshCombinationGroup.ts +++ b/packages/editor/src/classes/MeshCombinationGroup.ts @@ -1,6 +1,6 @@ import { BufferGeometry, Mesh, MeshBasicMaterial, MeshStandardMaterial, Object3D, SkinnedMesh, Texture } from 'three' -import { mergeBufferGeometries } from '@xrengine/engine/src/common/classes/BufferGeometryUtils' +import { mergeBufferGeometries } from '@etherealengine/engine/src/common/classes/BufferGeometryUtils' import asyncTraverse from '../functions/asyncTraverse' import hashImage from '../functions/hashImage' diff --git a/packages/editor/src/components/EditorContainer.tsx b/packages/editor/src/components/EditorContainer.tsx index e3af99d1d3..44e6cb56d7 100755 --- a/packages/editor/src/components/EditorContainer.tsx +++ b/packages/editor/src/components/EditorContainer.tsx @@ -7,13 +7,13 @@ import { useHotkeys } from 'react-hotkeys-hook' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { useRouter } from '@xrengine/client-core/src/common/services/RouterService' -import { SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import multiLogger from '@xrengine/common/src/logger' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getEngineState, useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { gltfToSceneJson, sceneToGLTF } from '@xrengine/engine/src/scene/functions/GLTFConversion' -import { dispatchAction } from '@xrengine/hyperflux' +import { useRouter } from '@etherealengine/client-core/src/common/services/RouterService' +import { SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import multiLogger from '@etherealengine/common/src/logger' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getEngineState, useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { gltfToSceneJson, sceneToGLTF } from '@etherealengine/engine/src/scene/functions/GLTFConversion' +import { dispatchAction } from '@etherealengine/hyperflux' import Inventory2Icon from '@mui/icons-material/Inventory2' import Dialog from '@mui/material/Dialog' diff --git a/packages/editor/src/components/assets/AssetDropZone.tsx b/packages/editor/src/components/assets/AssetDropZone.tsx index b0467eca75..d1a71a0663 100755 --- a/packages/editor/src/components/assets/AssetDropZone.tsx +++ b/packages/editor/src/components/assets/AssetDropZone.tsx @@ -4,9 +4,9 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { Vector2 } from 'three' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { dispatchAction } from '@xrengine/hyperflux' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { dispatchAction } from '@etherealengine/hyperflux' import CloudUploadIcon from '@mui/icons-material/CloudUpload' diff --git a/packages/editor/src/components/assets/AssetPreviewPanels/ModelPreviewPanel.tsx b/packages/editor/src/components/assets/AssetPreviewPanels/ModelPreviewPanel.tsx index c663919197..6eb0f564c0 100644 --- a/packages/editor/src/components/assets/AssetPreviewPanels/ModelPreviewPanel.tsx +++ b/packages/editor/src/components/assets/AssetPreviewPanels/ModelPreviewPanel.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useRef, useState } from 'react' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' -import { useRender3DPanelSystem } from '@xrengine/client-core/src/user/components/Panel3D/useRender3DPanelSystem' -import { loadAvatarModelAsset } from '@xrengine/engine/src/avatar/functions/avatarFunctions' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' +import { useRender3DPanelSystem } from '@etherealengine/client-core/src/user/components/Panel3D/useRender3DPanelSystem' +import { loadAvatarModelAsset } from '@etherealengine/engine/src/avatar/functions/avatarFunctions' import styles from '../styles.module.scss' diff --git a/packages/editor/src/components/assets/AssetsPreviewPanel.tsx b/packages/editor/src/components/assets/AssetsPreviewPanel.tsx index 16782d3ad9..3def1537c5 100644 --- a/packages/editor/src/components/assets/AssetsPreviewPanel.tsx +++ b/packages/editor/src/components/assets/AssetsPreviewPanel.tsx @@ -1,10 +1,10 @@ import React, { useImperativeHandle, useState } from 'react' import styled from 'styled-components' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { AssetType } from '@xrengine/engine/src/assets/enum/AssetType' -import createReadableTexture from '@xrengine/engine/src/assets/functions/createReadableTexture' -import { useHookstate } from '@xrengine/hyperflux' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { AssetType } from '@etherealengine/engine/src/assets/enum/AssetType' +import createReadableTexture from '@etherealengine/engine/src/assets/functions/createReadableTexture' +import { useHookstate } from '@etherealengine/hyperflux' import { AudioPreviewPanel } from './AssetPreviewPanels/AudioPreviewPanel' import { ImagePreviewPanel } from './AssetPreviewPanels/ImagePreviewPanel' diff --git a/packages/editor/src/components/assets/FileBrowserContentPanel.tsx b/packages/editor/src/components/assets/FileBrowserContentPanel.tsx index 26dfa7ff4d..cc5d99702e 100644 --- a/packages/editor/src/components/assets/FileBrowserContentPanel.tsx +++ b/packages/editor/src/components/assets/FileBrowserContentPanel.tsx @@ -2,23 +2,23 @@ import { Downgraded } from '@hookstate/core' import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import { API } from '@xrengine/client-core/src/API' -import ConfirmDialog from '@xrengine/client-core/src/common/components/ConfirmDialog' -import LoadingView from '@xrengine/client-core/src/common/components/LoadingView' +import { API } from '@etherealengine/client-core/src/API' +import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog' +import LoadingView from '@etherealengine/client-core/src/common/components/LoadingView' import { FileBrowserService, FileBrowserServiceReceptor, FILES_PAGE_LIMIT, useFileBrowserState -} from '@xrengine/client-core/src/common/services/FileBrowserService' -import { uploadToFeathersService } from '@xrengine/client-core/src/util/upload' -import { processFileName } from '@xrengine/common/src/utils/processFileName' -import { KTX2EncodeArguments } from '@xrengine/engine/src/assets/constants/CompressionParms' -import { KTX2EncodeDefaultArguments } from '@xrengine/engine/src/assets/constants/CompressionParms' -import { MediaPrefabs } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { ScenePrefabs } from '@xrengine/engine/src/scene/systems/SceneObjectUpdateSystem' -import { useState as useHFState } from '@xrengine/hyperflux' -import { addActionReceptor, removeActionReceptor } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/common/services/FileBrowserService' +import { uploadToFeathersService } from '@etherealengine/client-core/src/util/upload' +import { processFileName } from '@etherealengine/common/src/utils/processFileName' +import { KTX2EncodeArguments } from '@etherealengine/engine/src/assets/constants/CompressionParms' +import { KTX2EncodeDefaultArguments } from '@etherealengine/engine/src/assets/constants/CompressionParms' +import { MediaPrefabs } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { ScenePrefabs } from '@etherealengine/engine/src/scene/systems/SceneObjectUpdateSystem' +import { useState as useHFState } from '@etherealengine/hyperflux' +import { addActionReceptor, removeActionReceptor } from '@etherealengine/hyperflux' import ArrowBackIcon from '@mui/icons-material/ArrowBack' import AutorenewIcon from '@mui/icons-material/Autorenew' diff --git a/packages/editor/src/components/assets/FileBrowserGrid.tsx b/packages/editor/src/components/assets/FileBrowserGrid.tsx index 84a34582b8..986040a7ce 100755 --- a/packages/editor/src/components/assets/FileBrowserGrid.tsx +++ b/packages/editor/src/components/assets/FileBrowserGrid.tsx @@ -3,10 +3,10 @@ import { useDrag, useDrop } from 'react-dnd' import { getEmptyImage } from 'react-dnd-html5-backend' import { useTranslation } from 'react-i18next' -import { KTX2EncodeArguments } from '@xrengine/engine/src/assets/constants/CompressionParms' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { State } from '@xrengine/hyperflux' +import { KTX2EncodeArguments } from '@etherealengine/engine/src/assets/constants/CompressionParms' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { State } from '@etherealengine/hyperflux' import DescriptionIcon from '@mui/icons-material/Description' import FolderIcon from '@mui/icons-material/Folder' diff --git a/packages/editor/src/components/assets/ScenesPanel.tsx b/packages/editor/src/components/assets/ScenesPanel.tsx index 242074488c..d655424e15 100644 --- a/packages/editor/src/components/assets/ScenesPanel.tsx +++ b/packages/editor/src/components/assets/ScenesPanel.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import { useRouter } from '@xrengine/client-core/src/common/services/RouterService' -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' -import multiLogger from '@xrengine/common/src/logger' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { dispatchAction } from '@xrengine/hyperflux' +import { useRouter } from '@etherealengine/client-core/src/common/services/RouterService' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' +import multiLogger from '@etherealengine/common/src/logger' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { dispatchAction } from '@etherealengine/hyperflux' import { MoreVert } from '@mui/icons-material' import { ClickAwayListener } from '@mui/material' diff --git a/packages/editor/src/components/assets/useUpload.tsx b/packages/editor/src/components/assets/useUpload.tsx index 7bd74af816..c35836a449 100755 --- a/packages/editor/src/components/assets/useUpload.tsx +++ b/packages/editor/src/components/assets/useUpload.tsx @@ -1,8 +1,8 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' -import multiLogger from '@xrengine/common/src/logger' -import { AllFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' +import multiLogger from '@etherealengine/common/src/logger' +import { AllFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' import { getEntries, uploadProjectAssetsFromUpload } from '../../functions/assetFunctions' import { accessEditorState } from '../../services/EditorServices' diff --git a/packages/editor/src/components/controlText/ControlText.tsx b/packages/editor/src/components/controlText/ControlText.tsx index 405b571ba6..6e3b82fa9d 100644 --- a/packages/editor/src/components/controlText/ControlText.tsx +++ b/packages/editor/src/components/controlText/ControlText.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { TransformMode } from '@xrengine/engine/src/scene/constants/transformConstants' +import { TransformMode } from '@etherealengine/engine/src/scene/constants/transformConstants' import { useEditorHelperState } from '../../services/EditorHelperState' import { useSelectionState } from '../../services/SelectionServices' diff --git a/packages/editor/src/components/dialogs/SaveSceneDialog.tsx b/packages/editor/src/components/dialogs/SaveSceneDialog.tsx index dbcaea9d3f..9cdc06c2cc 100755 --- a/packages/editor/src/components/dialogs/SaveSceneDialog.tsx +++ b/packages/editor/src/components/dialogs/SaveSceneDialog.tsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' -import { dispatchAction, useState } from '@xrengine/hyperflux' +import { dispatchAction, useState } from '@etherealengine/hyperflux' import Box from '@mui/material/Box' diff --git a/packages/editor/src/components/element/ElementList.tsx b/packages/editor/src/components/element/ElementList.tsx index 8ac4758d4b..3168f980db 100644 --- a/packages/editor/src/components/element/ElementList.tsx +++ b/packages/editor/src/components/element/ElementList.tsx @@ -4,13 +4,13 @@ import { getEmptyImage } from 'react-dnd-html5-backend' import { useTranslation } from 'react-i18next' import { Vector2 } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent, setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { EntityOrObjectUUID, EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { LocalTransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent, setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { EntityOrObjectUUID, EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { LocalTransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' import { IconButton, MenuItem, PopoverPosition, Tooltip } from '@mui/material' diff --git a/packages/editor/src/components/geometry/GeometryEditor.tsx b/packages/editor/src/components/geometry/GeometryEditor.tsx index ffb4acc52e..1624c9fb3c 100644 --- a/packages/editor/src/components/geometry/GeometryEditor.tsx +++ b/packages/editor/src/components/geometry/GeometryEditor.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect } from 'react' import React from 'react' import { BufferGeometry } from 'three' -import { useHookstate } from '@xrengine/hyperflux' +import { useHookstate } from '@etherealengine/hyperflux' import DeleteIcon from '@mui/icons-material/DeleteForeverTwoTone' import { Box, Grid, Stack, Typography } from '@mui/material' diff --git a/packages/editor/src/components/graph/GraphPanel.tsx b/packages/editor/src/components/graph/GraphPanel.tsx index 7a6acdc84b..6933daa089 100644 --- a/packages/editor/src/components/graph/GraphPanel.tsx +++ b/packages/editor/src/components/graph/GraphPanel.tsx @@ -1,14 +1,14 @@ import React from 'react' import AutoSizer from 'react-virtualized-auto-sizer' -import { BehaveGraphComponent } from '@xrengine/engine/src/behave-graph/components/BehaveGraphComponent' -import { UndefinedEntity } from '@xrengine/engine/src/ecs/classes/Entity' +import { BehaveGraphComponent } from '@etherealengine/engine/src/behave-graph/components/BehaveGraphComponent' +import { UndefinedEntity } from '@etherealengine/engine/src/ecs/classes/Entity' import { getComponent, getComponentState, hasComponent, useOptionalComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import { useSelectionState } from '../../services/SelectionServices' import hierarchyStyles from '../hierarchy/styles.module.scss' diff --git a/packages/editor/src/components/hierarchy/HeirarchyTreeWalker.ts b/packages/editor/src/components/hierarchy/HeirarchyTreeWalker.ts index e6371f04af..aa32634778 100644 --- a/packages/editor/src/components/hierarchy/HeirarchyTreeWalker.ts +++ b/packages/editor/src/components/hierarchy/HeirarchyTreeWalker.ts @@ -1,9 +1,9 @@ import { Object3D } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID, EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent, hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID, EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' export type HeirarchyTreeNodeType = { depth: number diff --git a/packages/editor/src/components/hierarchy/HierarchyPanelContainer.tsx b/packages/editor/src/components/hierarchy/HierarchyPanelContainer.tsx index 8db27896e2..c8331e12bf 100644 --- a/packages/editor/src/components/hierarchy/HierarchyPanelContainer.tsx +++ b/packages/editor/src/components/hierarchy/HierarchyPanelContainer.tsx @@ -6,19 +6,23 @@ import AutoSizer from 'react-virtualized-auto-sizer' import { areEqual, FixedSizeList } from 'react-window' import { Object3D } from 'three' -import { AllFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent, getOptionalComponent, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +import { AllFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { + getComponent, + getOptionalComponent, + hasComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import { EntityTreeComponent, getEntityNodeArrayFromEntities, traverseEntityNode -} from '@xrengine/engine/src/ecs/functions/EntityTree' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { dispatchAction } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { dispatchAction } from '@etherealengine/hyperflux' import { Checkbox } from '@mui/material' import MenuItem from '@mui/material/MenuItem' diff --git a/packages/editor/src/components/hierarchy/HierarchyPanelTitle.tsx b/packages/editor/src/components/hierarchy/HierarchyPanelTitle.tsx index 5aa0729375..c75ea9abcc 100644 --- a/packages/editor/src/components/hierarchy/HierarchyPanelTitle.tsx +++ b/packages/editor/src/components/hierarchy/HierarchyPanelTitle.tsx @@ -1,7 +1,7 @@ import { t } from 'i18next' import React from 'react' -import { dispatchAction } from '@xrengine/hyperflux' +import { dispatchAction } from '@etherealengine/hyperflux' import AccountTreeIcon from '@mui/icons-material/AccountTree' import { Checkbox } from '@mui/material' diff --git a/packages/editor/src/components/hierarchy/HierarchyTreeNode.tsx b/packages/editor/src/components/hierarchy/HierarchyTreeNode.tsx index f7232f7d15..24e3617238 100644 --- a/packages/editor/src/components/hierarchy/HierarchyTreeNode.tsx +++ b/packages/editor/src/components/hierarchy/HierarchyTreeNode.tsx @@ -3,23 +3,23 @@ import { useDrag, useDrop } from 'react-dnd' import { getEmptyImage } from 'react-dnd-html5-backend' import { Object3D } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import { getAllComponents, getComponent, hasComponent, useComponent, useOptionalComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import { EntityOrObjectUUID, EntityTreeComponent, getEntityNodeArrayFromEntities -} from '@xrengine/engine/src/ecs/functions/EntityTree' -import { ErrorComponent, ErrorComponentType } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' +} from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { ErrorComponent, ErrorComponentType } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' import ArrowRightIcon from '@mui/icons-material/ArrowRight' diff --git a/packages/editor/src/components/inputs/AudioInput.tsx b/packages/editor/src/components/inputs/AudioInput.tsx index f3f1126b26..83387aed30 100755 --- a/packages/editor/src/components/inputs/AudioInput.tsx +++ b/packages/editor/src/components/inputs/AudioInput.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { AudioFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' +import { AudioFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' import { ItemTypes } from '../../constants/AssetTypes' import FileBrowserInput from './FileBrowserInput' diff --git a/packages/editor/src/components/inputs/BooleanInput.tsx b/packages/editor/src/components/inputs/BooleanInput.tsx index 42db8ae0bb..747786e2ef 100755 --- a/packages/editor/src/components/inputs/BooleanInput.tsx +++ b/packages/editor/src/components/inputs/BooleanInput.tsx @@ -1,7 +1,7 @@ import React, { KeyboardEvent, useState } from 'react' import styled from 'styled-components' -import { State, useHookstate } from '@xrengine/hyperflux/functions/StateFunctions' +import { State, useHookstate } from '@etherealengine/hyperflux/functions/StateFunctions' import CheckIcon from '@mui/icons-material/Check' diff --git a/packages/editor/src/components/inputs/EulerInput.tsx b/packages/editor/src/components/inputs/EulerInput.tsx index 7f4571d728..779089b2dd 100755 --- a/packages/editor/src/components/inputs/EulerInput.tsx +++ b/packages/editor/src/components/inputs/EulerInput.tsx @@ -2,7 +2,7 @@ import { hookstate, useHookstate, useState } from '@hookstate/core' import React, { useCallback, useEffect } from 'react' import { MathUtils as _Math, Euler, Quaternion } from 'three' -import { defineState, NO_PROXY } from '@xrengine/hyperflux' +import { defineState, NO_PROXY } from '@etherealengine/hyperflux' import NumericInput from './NumericInput' import { UniformButtonContainer, Vector3InputContainer, Vector3Scrubber } from './Vector3Input' diff --git a/packages/editor/src/components/inputs/FileBrowserInput.tsx b/packages/editor/src/components/inputs/FileBrowserInput.tsx index 17e23be02c..de75a941a5 100644 --- a/packages/editor/src/components/inputs/FileBrowserInput.tsx +++ b/packages/editor/src/components/inputs/FileBrowserInput.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useDrop } from 'react-dnd' -import { AssetType } from '@xrengine/engine/src/assets/enum/AssetType' +import { AssetType } from '@etherealengine/engine/src/assets/enum/AssetType' import { ItemTypes } from '../../constants/AssetTypes' import useUpload from '../assets/useUpload' diff --git a/packages/editor/src/components/inputs/FolderInput.tsx b/packages/editor/src/components/inputs/FolderInput.tsx index b5d1d4f8e0..5da7c4ec40 100755 --- a/packages/editor/src/components/inputs/FolderInput.tsx +++ b/packages/editor/src/components/inputs/FolderInput.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { AllFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' +import { AllFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' import { ItemTypes } from '../../constants/AssetTypes' import FileBrowserInput from './FileBrowserInput' diff --git a/packages/editor/src/components/inputs/ImageInput.tsx b/packages/editor/src/components/inputs/ImageInput.tsx index af99a52e79..93f20819eb 100755 --- a/packages/editor/src/components/inputs/ImageInput.tsx +++ b/packages/editor/src/components/inputs/ImageInput.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { ImageFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' +import { ImageFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' import { ItemTypes } from '../../constants/AssetTypes' import FileBrowserInput from './FileBrowserInput' diff --git a/packages/editor/src/components/inputs/MaterialInput.tsx b/packages/editor/src/components/inputs/MaterialInput.tsx index 82fa59ef6e..5b9a70f56d 100644 --- a/packages/editor/src/components/inputs/MaterialInput.tsx +++ b/packages/editor/src/components/inputs/MaterialInput.tsx @@ -1,7 +1,7 @@ import React from 'react' import { DropTargetMonitor, useDrop } from 'react-dnd' -import { EntityOrObjectUUID } from '@xrengine/engine/src/ecs/functions/EntityTree' +import { EntityOrObjectUUID } from '@etherealengine/engine/src/ecs/functions/EntityTree' import { ItemTypes } from '../../constants/AssetTypes' import { ControlledStringInput } from './StringInput' diff --git a/packages/editor/src/components/inputs/ModelInput.tsx b/packages/editor/src/components/inputs/ModelInput.tsx index fec7f31a64..f115725ad5 100755 --- a/packages/editor/src/components/inputs/ModelInput.tsx +++ b/packages/editor/src/components/inputs/ModelInput.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { ModelFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' +import { ModelFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' import { ItemTypes } from '../../constants/AssetTypes' import FileBrowserInput from './FileBrowserInput' diff --git a/packages/editor/src/components/inputs/NumericInput.tsx b/packages/editor/src/components/inputs/NumericInput.tsx index b9691cbef2..7d249ca9a1 100755 --- a/packages/editor/src/components/inputs/NumericInput.tsx +++ b/packages/editor/src/components/inputs/NumericInput.tsx @@ -4,7 +4,7 @@ import { useRef } from 'react' import { useState } from 'react' import styled from 'styled-components' -import { clamp } from '@xrengine/engine/src/common/functions/MathLerpFunctions' +import { clamp } from '@etherealengine/engine/src/common/functions/MathLerpFunctions' import { getStepSize, toPrecision } from '../../functions/utils' diff --git a/packages/editor/src/components/inputs/ParameterInput.tsx b/packages/editor/src/components/inputs/ParameterInput.tsx index 0f2de95f7f..b2ba9621a1 100644 --- a/packages/editor/src/components/inputs/ParameterInput.tsx +++ b/packages/editor/src/components/inputs/ParameterInput.tsx @@ -1,6 +1,6 @@ import React, { Fragment } from 'react' -import { generateDefaults } from '@xrengine/engine/src/renderer/materials/constants/DefaultArgs' +import { generateDefaults } from '@etherealengine/engine/src/renderer/materials/constants/DefaultArgs' import BooleanInput from './BooleanInput' import ColorInput from './ColorInput' diff --git a/packages/editor/src/components/inputs/RandomizedPropertyInput.tsx b/packages/editor/src/components/inputs/RandomizedPropertyInput.tsx index 3df3b4024d..5d2e940009 100644 --- a/packages/editor/src/components/inputs/RandomizedPropertyInput.tsx +++ b/packages/editor/src/components/inputs/RandomizedPropertyInput.tsx @@ -2,8 +2,8 @@ import React, { Component, useCallback } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { RandomizedProperty } from '@xrengine/engine/src/scene/components/InstancingComponent' -import { State } from '@xrengine/hyperflux' +import { RandomizedProperty } from '@etherealengine/engine/src/scene/components/InstancingComponent' +import { State } from '@etherealengine/hyperflux' import { Stack } from '@mui/material' diff --git a/packages/editor/src/components/inputs/SceneObjectInput.tsx b/packages/editor/src/components/inputs/SceneObjectInput.tsx index 9cbc952f1a..26f71a6917 100644 --- a/packages/editor/src/components/inputs/SceneObjectInput.tsx +++ b/packages/editor/src/components/inputs/SceneObjectInput.tsx @@ -1,10 +1,10 @@ import React from 'react' import { DropTargetMonitor, useDrop } from 'react-dnd' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' import { ItemTypes } from '../../constants/AssetTypes' import { ControlledStringInput } from './StringInput' diff --git a/packages/editor/src/components/inputs/ScriptInput.tsx b/packages/editor/src/components/inputs/ScriptInput.tsx index 500d5d7c72..22a63c91bb 100755 --- a/packages/editor/src/components/inputs/ScriptInput.tsx +++ b/packages/editor/src/components/inputs/ScriptInput.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { CustomScriptFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' +import { CustomScriptFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' import { ItemTypes } from '../../constants/AssetTypes' import FileBrowserInput from './FileBrowserInput' diff --git a/packages/editor/src/components/inputs/Scrubber.tsx b/packages/editor/src/components/inputs/Scrubber.tsx index 461a863893..2af6b03a10 100755 --- a/packages/editor/src/components/inputs/Scrubber.tsx +++ b/packages/editor/src/components/inputs/Scrubber.tsx @@ -2,7 +2,7 @@ import { useHookstate } from '@hookstate/core' import React, { ReactNode, useEffect, useRef } from 'react' import styled from 'styled-components' -import { clamp } from '@xrengine/engine/src/common/functions/MathLerpFunctions' +import { clamp } from '@etherealengine/engine/src/common/functions/MathLerpFunctions' import MultipleStopIcon from '@mui/icons-material/MultipleStop' diff --git a/packages/editor/src/components/inputs/TexturePreviewInput.tsx b/packages/editor/src/components/inputs/TexturePreviewInput.tsx index 8c854e48ac..d41c53be62 100644 --- a/packages/editor/src/components/inputs/TexturePreviewInput.tsx +++ b/packages/editor/src/components/inputs/TexturePreviewInput.tsx @@ -1,10 +1,10 @@ import React, { Fragment } from 'react' import { Texture, Vector2 } from 'three' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { ImageFileTypes, VideoFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' -import { AssetClass } from '@xrengine/engine/src/assets/enum/AssetClass' -import { useHookstate } from '@xrengine/hyperflux' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { ImageFileTypes, VideoFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' +import { AssetClass } from '@etherealengine/engine/src/assets/enum/AssetClass' +import { useHookstate } from '@etherealengine/hyperflux' import { Stack } from '@mui/material' diff --git a/packages/editor/src/components/inputs/VideoInput.tsx b/packages/editor/src/components/inputs/VideoInput.tsx index bad646525d..4e41838213 100755 --- a/packages/editor/src/components/inputs/VideoInput.tsx +++ b/packages/editor/src/components/inputs/VideoInput.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { VideoFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' +import { VideoFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' import { ItemTypes } from '../../constants/AssetTypes' import FileBrowserInput from './FileBrowserInput' diff --git a/packages/editor/src/components/layout/PaginatedList.tsx b/packages/editor/src/components/layout/PaginatedList.tsx index f41c8b356b..17952c9198 100644 --- a/packages/editor/src/components/layout/PaginatedList.tsx +++ b/packages/editor/src/components/layout/PaginatedList.tsx @@ -1,7 +1,7 @@ import React, { JSXElementConstructor, useEffect } from 'react' -import { any } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { State, useHookstate } from '@xrengine/hyperflux' +import { any } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { State, useHookstate } from '@etherealengine/hyperflux' import { Grid, Stack } from '@mui/material' diff --git a/packages/editor/src/components/materials/MaterialEditor.tsx b/packages/editor/src/components/materials/MaterialEditor.tsx index 0b71d9f1b6..b883fc1d0f 100644 --- a/packages/editor/src/components/materials/MaterialEditor.tsx +++ b/packages/editor/src/components/materials/MaterialEditor.tsx @@ -1,16 +1,16 @@ import React, { useCallback, useEffect } from 'react' import { Material, Texture } from 'three' -import styles from '@xrengine/editor/src/components/layout/styles.module.scss' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import createReadableTexture from '@xrengine/engine/src/assets/functions/createReadableTexture' +import styles from '@etherealengine/editor/src/components/layout/styles.module.scss' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import createReadableTexture from '@etherealengine/engine/src/assets/functions/createReadableTexture' import { changeMaterialPrototype, materialFromId, prototypeFromId -} from '@xrengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' -import { useMaterialLibrary } from '@xrengine/engine/src/renderer/materials/MaterialLibrary' -import { useState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' +import { useMaterialLibrary } from '@etherealengine/engine/src/renderer/materials/MaterialLibrary' +import { useState } from '@etherealengine/hyperflux' import { Box, Divider, Stack } from '@mui/material' diff --git a/packages/editor/src/components/materials/MaterialLibraryEntry.tsx b/packages/editor/src/components/materials/MaterialLibraryEntry.tsx index 6bd5700891..6399cd775b 100644 --- a/packages/editor/src/components/materials/MaterialLibraryEntry.tsx +++ b/packages/editor/src/components/materials/MaterialLibraryEntry.tsx @@ -2,15 +2,18 @@ import React, { MouseEvent, StyleHTMLAttributes, useCallback } from 'react' import { useDrag } from 'react-dnd' import { Material } from 'three' -import { pathResolver } from '@xrengine/engine/src/assets/functions/pathResolver' -import { MaterialComponentType } from '@xrengine/engine/src/renderer/materials/components/MaterialComponent' +import { pathResolver } from '@etherealengine/engine/src/assets/functions/pathResolver' +import { MaterialComponentType } from '@etherealengine/engine/src/renderer/materials/components/MaterialComponent' import { MaterialPrototypeComponent, MaterialPrototypeComponentType -} from '@xrengine/engine/src/renderer/materials/components/MaterialPrototypeComponent' -import { MaterialSourceComponentType } from '@xrengine/engine/src/renderer/materials/components/MaterialSource' -import { LibraryEntryType } from '@xrengine/engine/src/renderer/materials/constants/LibraryEntry' -import { entryId, hashMaterialSource } from '@xrengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' +} from '@etherealengine/engine/src/renderer/materials/components/MaterialPrototypeComponent' +import { MaterialSourceComponentType } from '@etherealengine/engine/src/renderer/materials/components/MaterialSource' +import { LibraryEntryType } from '@etherealengine/engine/src/renderer/materials/constants/LibraryEntry' +import { + entryId, + hashMaterialSource +} from '@etherealengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' import ArrowRightIcon from '@mui/icons-material/ArrowRight' diff --git a/packages/editor/src/components/materials/MaterialLibraryPanel.tsx b/packages/editor/src/components/materials/MaterialLibraryPanel.tsx index aab65681f1..af3b1a137c 100644 --- a/packages/editor/src/components/materials/MaterialLibraryPanel.tsx +++ b/packages/editor/src/components/materials/MaterialLibraryPanel.tsx @@ -4,18 +4,18 @@ import AutoSizer from 'react-virtualized-auto-sizer' import { areEqual, FixedSizeList } from 'react-window' import { MeshBasicMaterial } from 'three' -import exportMaterialsGLTF from '@xrengine/engine/src/assets/functions/exportMaterialsGLTF' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { SourceType } from '@xrengine/engine/src/renderer/materials/components/MaterialSource' -import { LibraryEntryType } from '@xrengine/engine/src/renderer/materials/constants/LibraryEntry' +import exportMaterialsGLTF from '@etherealengine/engine/src/assets/functions/exportMaterialsGLTF' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { SourceType } from '@etherealengine/engine/src/renderer/materials/components/MaterialSource' +import { LibraryEntryType } from '@etherealengine/engine/src/renderer/materials/constants/LibraryEntry' import { entryId, hashMaterialSource, materialFromId, registerMaterial -} from '@xrengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' -import { useMaterialLibrary } from '@xrengine/engine/src/renderer/materials/MaterialLibrary' -import { createActionQueue, getState, removeActionQueue, useState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' +import { useMaterialLibrary } from '@etherealengine/engine/src/renderer/materials/MaterialLibrary' +import { createActionQueue, getState, removeActionQueue, useState } from '@etherealengine/hyperflux' import { Divider, Grid, Stack } from '@mui/material' diff --git a/packages/editor/src/components/projects/DeleteDialog.tsx b/packages/editor/src/components/projects/DeleteDialog.tsx index 3807aff941..a34921d57b 100644 --- a/packages/editor/src/components/projects/DeleteDialog.tsx +++ b/packages/editor/src/components/projects/DeleteDialog.tsx @@ -1,6 +1,6 @@ import React, { MouseEventHandler } from 'react' -import { isDev } from '@xrengine/common/src/config' +import { isDev } from '@etherealengine/common/src/config' import { Dialog, DialogContent, DialogTitle } from '@mui/material' import Fade from '@mui/material/Fade' diff --git a/packages/editor/src/components/projects/EditPermissionsDialog.tsx b/packages/editor/src/components/projects/EditPermissionsDialog.tsx index 32575b4986..f19d3853a3 100644 --- a/packages/editor/src/components/projects/EditPermissionsDialog.tsx +++ b/packages/editor/src/components/projects/EditPermissionsDialog.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { ProjectInterface } from '@xrengine/common/src/interfaces/ProjectInterface' -import { ProjectPermissionInterface } from '@xrengine/common/src/interfaces/ProjectPermissionInterface' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { ProjectInterface } from '@etherealengine/common/src/interfaces/ProjectInterface' +import { ProjectPermissionInterface } from '@etherealengine/common/src/interfaces/ProjectPermissionInterface' import HighlightOffIcon from '@mui/icons-material/HighlightOff' import { Dialog, DialogContent, DialogTitle, TextField } from '@mui/material' diff --git a/packages/editor/src/components/projects/EditorNavbarProfile.tsx b/packages/editor/src/components/projects/EditorNavbarProfile.tsx index 76ddb3affc..b736ae8bff 100644 --- a/packages/editor/src/components/projects/EditorNavbarProfile.tsx +++ b/packages/editor/src/components/projects/EditorNavbarProfile.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react' -import ProfileMenu from '@xrengine/client-core/src/user/components/UserMenu/menus/ProfileMenu' -import SettingMenu from '@xrengine/client-core/src/user/components/UserMenu/menus/SettingMenu' -import { Views } from '@xrengine/client-core/src/user/components/UserMenu/util' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' +import ProfileMenu from '@etherealengine/client-core/src/user/components/UserMenu/menus/ProfileMenu' +import SettingMenu from '@etherealengine/client-core/src/user/components/UserMenu/menus/SettingMenu' +import { Views } from '@etherealengine/client-core/src/user/components/UserMenu/util' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' import { Person } from '@mui/icons-material' import { Box, IconButton, Popover } from '@mui/material' diff --git a/packages/editor/src/components/projects/ProjectsPage.tsx b/packages/editor/src/components/projects/ProjectsPage.tsx index c869f1bcec..517c54e9c7 100644 --- a/packages/editor/src/components/projects/ProjectsPage.tsx +++ b/packages/editor/src/components/projects/ProjectsPage.tsx @@ -1,15 +1,15 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import ProjectDrawer from '@xrengine/client-core/src/admin/components/Project/ProjectDrawer' -import { ProjectService, useProjectState } from '@xrengine/client-core/src/common/services/ProjectService' -import { useRouter } from '@xrengine/client-core/src/common/services/RouterService' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { ProjectInterface } from '@xrengine/common/src/interfaces/ProjectInterface' -import multiLogger from '@xrengine/common/src/logger' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { initSystems } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { dispatchAction, useHookstate } from '@xrengine/hyperflux' +import ProjectDrawer from '@etherealengine/client-core/src/admin/components/Project/ProjectDrawer' +import { ProjectService, useProjectState } from '@etherealengine/client-core/src/common/services/ProjectService' +import { useRouter } from '@etherealengine/client-core/src/common/services/RouterService' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { ProjectInterface } from '@etherealengine/common/src/interfaces/ProjectInterface' +import multiLogger from '@etherealengine/common/src/logger' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { initSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { dispatchAction, useHookstate } from '@etherealengine/hyperflux' import { ArrowRightRounded, @@ -60,15 +60,15 @@ const OfficialProjectData = [ { id: '1570ae00-889a-11ec-886e-b126f7590685', name: 'Development Test Suite', - repositoryPath: 'https://github.com/XRFoundation/XREngine-development-test-suite', + repositoryPath: 'https://github.com/etherealengine/ee-development-test-suite', thumbnail: '/static/etherealengine.png', - description: 'Assets and tests for xrengine core development', + description: 'Assets and tests for etherealengine core development', needsRebuild: true }, { id: '1570ae01-889a-11ec-886e-b126f7590685', name: 'Translations', - repositoryPath: 'https://github.com/XRFoundation/XREngine-i18n', + repositoryPath: 'https://github.com/etherealengine/ee-i18n', thumbnail: '/static/etherealengine.png', description: 'Complete language translations in over 100 languages.', needsRebuild: true @@ -76,7 +76,7 @@ const OfficialProjectData = [ { id: '1570ae02-889a-11ec-886e-b126f7590685', name: 'Test Bot', - repositoryPath: 'https://github.com/XRFoundation/XREngine-Bot', + repositoryPath: 'https://github.com/etherealengine/ee-bot', thumbnail: '/static/etherealengine.png', description: 'A test bot using puppeteer', needsRebuild: true @@ -84,7 +84,7 @@ const OfficialProjectData = [ { id: '1570ae11-889a-11ec-886e-b126f7590685', name: 'Maps', - repositoryPath: 'https://github.com/XRFoundation/XREngine-Project-Maps', + repositoryPath: 'https://github.com/etherealengine/ee-maps', thumbnail: '/static/etherealengine.png', description: 'Procedurally generated map tiles using geojson data with mapbox and turf.js', needsRebuild: true @@ -92,7 +92,7 @@ const OfficialProjectData = [ { id: '1570ae12-889a-11ec-886e-b126f7590685', name: 'Inventory', - repositoryPath: 'https://github.com/XRFoundation/XREngine-Project-Inventory', + repositoryPath: 'https://github.com/etherealengine/ee-inventory', thumbnail: '/static/etherealengine.png', description: 'Item inventory, trade & virtual currency. Allow your users to use a database, IPFS, DID or blockchain backed item storage for equippables, wearables and tradable items.', @@ -101,26 +101,17 @@ const OfficialProjectData = [ { id: '1570ae14-889a-11ec-886e-b126f7590685', name: 'Digital Beings', - repositoryPath: 'https://github.com/XRFoundation/XREngine-Project-Digital-Beings', + repositoryPath: 'https://github.com/etherealengine/ee-digital-beings', thumbnail: '/static/etherealengine.png', description: 'Enhance your virtual worlds with GPT-3 backed AI agents!', needsRebuild: true - }, - { - id: '1570ae15-889a-11ec-886e-b126f7590685', - name: 'Harmony Chat', - repositoryPath: 'https://github.com/XRFoundation/Harmony-Chat', - thumbnail: '/static/etherealengine.png', - description: - 'An elegant and minimalist messenger client with group text, audio, video and screensharing capabilities.', - needsRebuild: true } ] const ProjectUpdateSystemInjection = { uuid: 'core.admin.ProjectUpdateSystem', type: 'PRE_RENDER', - systemLoader: () => import('@xrengine/client-core/src/systems/ProjectUpdateSystem') + systemLoader: () => import('@etherealengine/client-core/src/systems/ProjectUpdateSystem') } as const const CommunityProjectData = [] as any diff --git a/packages/editor/src/components/properties/AmbientLightNodeEditor.tsx b/packages/editor/src/components/properties/AmbientLightNodeEditor.tsx index a28d9a0c24..952a6c67d2 100755 --- a/packages/editor/src/components/properties/AmbientLightNodeEditor.tsx +++ b/packages/editor/src/components/properties/AmbientLightNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent, useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { AmbientLightComponent } from '@xrengine/engine/src/scene/components/AmbientLightComponent' +import { getComponent, useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { AmbientLightComponent } from '@etherealengine/engine/src/scene/components/AmbientLightComponent' import Brightness7Icon from '@mui/icons-material/Brightness7' diff --git a/packages/editor/src/components/properties/CameraPropertiesNodeEditor.tsx b/packages/editor/src/components/properties/CameraPropertiesNodeEditor.tsx index e020a1a468..174224c679 100644 --- a/packages/editor/src/components/properties/CameraPropertiesNodeEditor.tsx +++ b/packages/editor/src/components/properties/CameraPropertiesNodeEditor.tsx @@ -1,11 +1,11 @@ import { t } from 'i18next' import React from 'react' -import { getCameraSceneMetadataState } from '@xrengine/engine/src/camera/systems/CameraSystem' -import { CameraMode } from '@xrengine/engine/src/camera/types/CameraMode' -import { ProjectionType } from '@xrengine/engine/src/camera/types/ProjectionType' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useHookstate } from '@xrengine/hyperflux' +import { getCameraSceneMetadataState } from '@etherealengine/engine/src/camera/systems/CameraSystem' +import { CameraMode } from '@etherealengine/engine/src/camera/types/CameraMode' +import { ProjectionType } from '@etherealengine/engine/src/camera/types/ProjectionType' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useHookstate } from '@etherealengine/hyperflux' import CameraAltIcon from '@mui/icons-material/CameraAlt' diff --git a/packages/editor/src/components/properties/CloudsNodeEditor.tsx b/packages/editor/src/components/properties/CloudsNodeEditor.tsx index e09e90f43d..0930c93837 100755 --- a/packages/editor/src/components/properties/CloudsNodeEditor.tsx +++ b/packages/editor/src/components/properties/CloudsNodeEditor.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent, useOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { CloudComponent } from '@xrengine/engine/src/scene/components/CloudComponent' -import { ErrorComponent } from '@xrengine/engine/src/scene/components/ErrorComponent' +import { useComponent, useOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { CloudComponent } from '@etherealengine/engine/src/scene/components/CloudComponent' +import { ErrorComponent } from '@etherealengine/engine/src/scene/components/ErrorComponent' import CloudIcon from '@mui/icons-material/Cloud' diff --git a/packages/editor/src/components/properties/ColliderNodeEditor.tsx b/packages/editor/src/components/properties/ColliderNodeEditor.tsx index b796e1f059..5b4c77b102 100755 --- a/packages/editor/src/components/properties/ColliderNodeEditor.tsx +++ b/packages/editor/src/components/properties/ColliderNodeEditor.tsx @@ -2,19 +2,22 @@ import { RigidBodyType, ShapeType } from '@dimforge/rapier3d-compat' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { camelCaseToSpacedString } from '@xrengine/common/src/utils/camelCaseToSpacedString' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' +import { camelCaseToSpacedString } from '@etherealengine/common/src/utils/camelCaseToSpacedString' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' import { ComponentType, defineQuery, getComponent, hasComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { CallbackComponent } from '@xrengine/engine/src/scene/components/CallbackComponent' -import { ColliderComponent, supportedColliderShapes } from '@xrengine/engine/src/scene/components/ColliderComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { CallbackComponent } from '@etherealengine/engine/src/scene/components/CallbackComponent' +import { + ColliderComponent, + supportedColliderShapes +} from '@etherealengine/engine/src/scene/components/ColliderComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' import PanToolIcon from '@mui/icons-material/PanTool' diff --git a/packages/editor/src/components/properties/CoreNodeEditor.tsx b/packages/editor/src/components/properties/CoreNodeEditor.tsx index a0ec830469..764f02ef5b 100644 --- a/packages/editor/src/components/properties/CoreNodeEditor.tsx +++ b/packages/editor/src/components/properties/CoreNodeEditor.tsx @@ -2,18 +2,18 @@ import React from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' import { ComponentMap, hasComponent, setComponent, useOptionalComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID, getEntityNodeArrayFromEntities } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { PreventBakeTagComponent } from '@xrengine/engine/src/scene/components/PreventBakeTagComponent' -import { SceneTagComponent } from '@xrengine/engine/src/scene/components/SceneTagComponent' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { dispatchAction, getState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID, getEntityNodeArrayFromEntities } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { PreventBakeTagComponent } from '@etherealengine/engine/src/scene/components/PreventBakeTagComponent' +import { SceneTagComponent } from '@etherealengine/engine/src/scene/components/SceneTagComponent' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import AddIcon from '@mui/icons-material/Add' diff --git a/packages/editor/src/components/properties/DirectionalLightNodeEditor.tsx b/packages/editor/src/components/properties/DirectionalLightNodeEditor.tsx index 54a5df79f5..658d3175cd 100755 --- a/packages/editor/src/components/properties/DirectionalLightNodeEditor.tsx +++ b/packages/editor/src/components/properties/DirectionalLightNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { DirectionalLightComponent } from '@xrengine/engine/src/scene/components/DirectionalLightComponent' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { DirectionalLightComponent } from '@etherealengine/engine/src/scene/components/DirectionalLightComponent' import BoltIcon from '@mui/icons-material/Bolt' diff --git a/packages/editor/src/components/properties/EnvMapBakeNodeEditor.tsx b/packages/editor/src/components/properties/EnvMapBakeNodeEditor.tsx index de78dc1727..ac1f666a74 100644 --- a/packages/editor/src/components/properties/EnvMapBakeNodeEditor.tsx +++ b/packages/editor/src/components/properties/EnvMapBakeNodeEditor.tsx @@ -1,9 +1,9 @@ import React from 'react' import styled from 'styled-components' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EnvMapBakeComponent } from '@xrengine/engine/src/scene/components/EnvMapBakeComponent' -import { EnvMapBakeTypes } from '@xrengine/engine/src/scene/types/EnvMapBakeTypes' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EnvMapBakeComponent } from '@etherealengine/engine/src/scene/components/EnvMapBakeComponent' +import { EnvMapBakeTypes } from '@etherealengine/engine/src/scene/types/EnvMapBakeTypes' import SportsGolfIcon from '@mui/icons-material/SportsGolf' diff --git a/packages/editor/src/components/properties/EnvMapBakeProperties.tsx b/packages/editor/src/components/properties/EnvMapBakeProperties.tsx index c97198db2b..478145a4f4 100644 --- a/packages/editor/src/components/properties/EnvMapBakeProperties.tsx +++ b/packages/editor/src/components/properties/EnvMapBakeProperties.tsx @@ -1,10 +1,10 @@ import React from 'react' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { ComponentType } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EnvMapBakeComponent } from '@xrengine/engine/src/scene/components/EnvMapBakeComponent' -import { EnvMapBakeRefreshTypes } from '@xrengine/engine/src/scene/types/EnvMapBakeRefreshTypes' -import { EnvMapBakeTypes } from '@xrengine/engine/src/scene/types/EnvMapBakeTypes' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { ComponentType } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EnvMapBakeComponent } from '@etherealengine/engine/src/scene/components/EnvMapBakeComponent' +import { EnvMapBakeRefreshTypes } from '@etherealengine/engine/src/scene/types/EnvMapBakeRefreshTypes' +import { EnvMapBakeTypes } from '@etherealengine/engine/src/scene/types/EnvMapBakeTypes' import BooleanInput from '../inputs/BooleanInput' import InputGroup from '../inputs/InputGroup' diff --git a/packages/editor/src/components/properties/EnvMapEditor.tsx b/packages/editor/src/components/properties/EnvMapEditor.tsx index abbaa6d934..b25b5ea5e7 100644 --- a/packages/editor/src/components/properties/EnvMapEditor.tsx +++ b/packages/editor/src/components/properties/EnvMapEditor.tsx @@ -1,12 +1,12 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { getComponent, useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EnvmapComponent, SCENE_COMPONENT_ENVMAP } from '@xrengine/engine/src/scene/components/EnvmapComponent' -import { ErrorComponent, getEntityErrors } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { EnvMapSourceType, EnvMapTextureType } from '@xrengine/engine/src/scene/constants/EnvMapEnum' -import { deserializeEnvMap } from '@xrengine/engine/src/scene/functions/loaders/EnvMapFunctions' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { getComponent, useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EnvmapComponent, SCENE_COMPONENT_ENVMAP } from '@etherealengine/engine/src/scene/components/EnvmapComponent' +import { ErrorComponent, getEntityErrors } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { EnvMapSourceType, EnvMapTextureType } from '@etherealengine/engine/src/scene/constants/EnvMapEnum' +import { deserializeEnvMap } from '@etherealengine/engine/src/scene/functions/loaders/EnvMapFunctions' import ColorInput from '../inputs/ColorInput' import CompoundNumericInput from '../inputs/CompoundNumericInput' diff --git a/packages/editor/src/components/properties/FogSettingsEditor.tsx b/packages/editor/src/components/properties/FogSettingsEditor.tsx index ed9845c087..d28d4c7be2 100644 --- a/packages/editor/src/components/properties/FogSettingsEditor.tsx +++ b/packages/editor/src/components/properties/FogSettingsEditor.tsx @@ -3,9 +3,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Color } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { FogType } from '@xrengine/engine/src/scene/constants/FogType' -import { getFogSceneMetadataState } from '@xrengine/engine/src/scene/systems/FogSystem' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { FogType } from '@etherealengine/engine/src/scene/constants/FogType' +import { getFogSceneMetadataState } from '@etherealengine/engine/src/scene/systems/FogSystem' import ColorInput from '../inputs/ColorInput' import InputGroup from '../inputs/InputGroup' diff --git a/packages/editor/src/components/properties/GroundPlaneNodeEditor.tsx b/packages/editor/src/components/properties/GroundPlaneNodeEditor.tsx index 5f30329fd7..03cce605c1 100755 --- a/packages/editor/src/components/properties/GroundPlaneNodeEditor.tsx +++ b/packages/editor/src/components/properties/GroundPlaneNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { GroundPlaneComponent } from '@xrengine/engine/src/scene/components/GroundPlaneComponent' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { GroundPlaneComponent } from '@etherealengine/engine/src/scene/components/GroundPlaneComponent' import SquareIcon from '@mui/icons-material/Square' diff --git a/packages/editor/src/components/properties/HemisphereLightNodeEditor.tsx b/packages/editor/src/components/properties/HemisphereLightNodeEditor.tsx index 4302a91561..6df0cfda99 100755 --- a/packages/editor/src/components/properties/HemisphereLightNodeEditor.tsx +++ b/packages/editor/src/components/properties/HemisphereLightNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { HemisphereLightComponent } from '@xrengine/engine/src/scene/components/HemisphereLightComponent' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { HemisphereLightComponent } from '@etherealengine/engine/src/scene/components/HemisphereLightComponent' import VerifiedUserIcon from '@mui/icons-material/VerifiedUser' diff --git a/packages/editor/src/components/properties/ImageNodeEditor.tsx b/packages/editor/src/components/properties/ImageNodeEditor.tsx index 25d1c9f161..989d82bb80 100755 --- a/packages/editor/src/components/properties/ImageNodeEditor.tsx +++ b/packages/editor/src/components/properties/ImageNodeEditor.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { getEntityErrors } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { ImageComponent } from '@xrengine/engine/src/scene/components/ImageComponent' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { getEntityErrors } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { ImageComponent } from '@etherealengine/engine/src/scene/components/ImageComponent' import PhotoSizeSelectActualIcon from '@mui/icons-material/PhotoSizeSelectActual' diff --git a/packages/editor/src/components/properties/ImageSourceProperties.tsx b/packages/editor/src/components/properties/ImageSourceProperties.tsx index 7c7788c514..1bb765407c 100644 --- a/packages/editor/src/components/properties/ImageSourceProperties.tsx +++ b/packages/editor/src/components/properties/ImageSourceProperties.tsx @@ -2,9 +2,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { BackSide, DoubleSide, FrontSide } from 'three' -import { getComponent, useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { ImageAlphaMode, ImageProjection } from '@xrengine/engine/src/scene/classes/ImageUtils' -import { ImageComponent } from '@xrengine/engine/src/scene/components/ImageComponent' +import { getComponent, useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { ImageAlphaMode, ImageProjection } from '@etherealengine/engine/src/scene/classes/ImageUtils' +import { ImageComponent } from '@etherealengine/engine/src/scene/components/ImageComponent' import InputGroup from '../inputs/InputGroup' import NumericInputGroup from '../inputs/NumericInputGroup' diff --git a/packages/editor/src/components/properties/InstancingGrassProperties.tsx b/packages/editor/src/components/properties/InstancingGrassProperties.tsx index a24593aa12..d5a6fc571c 100644 --- a/packages/editor/src/components/properties/InstancingGrassProperties.tsx +++ b/packages/editor/src/components/properties/InstancingGrassProperties.tsx @@ -3,8 +3,8 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { Texture } from 'three' -import { GrassProperties, TextureRef } from '@xrengine/engine/src/scene/components/InstancingComponent' -import { State, useState } from '@xrengine/hyperflux' +import { GrassProperties, TextureRef } from '@etherealengine/engine/src/scene/components/InstancingComponent' +import { State, useState } from '@etherealengine/hyperflux' import ExpandMoreIcon from '@mui/icons-material/ExpandMore' import { Box, Collapse, IconButton, IconButtonProps } from '@mui/material' diff --git a/packages/editor/src/components/properties/InstancingMeshProperties.tsx b/packages/editor/src/components/properties/InstancingMeshProperties.tsx index 4792001441..45a8aaf0e4 100644 --- a/packages/editor/src/components/properties/InstancingMeshProperties.tsx +++ b/packages/editor/src/components/properties/InstancingMeshProperties.tsx @@ -2,13 +2,13 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' import { Mesh } from 'three' -import { getComponent, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { MeshProperties } from '@xrengine/engine/src/scene/components/InstancingComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import iterateObject3D from '@xrengine/engine/src/scene/util/iterateObject3D' -import { State } from '@xrengine/hyperflux' +import { getComponent, hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { MeshProperties } from '@etherealengine/engine/src/scene/components/InstancingComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import iterateObject3D from '@etherealengine/engine/src/scene/util/iterateObject3D' +import { State } from '@etherealengine/hyperflux' import InputGroup from '../inputs/InputGroup' import SelectInput from '../inputs/SelectInput' diff --git a/packages/editor/src/components/properties/InstancingNodeEditor.tsx b/packages/editor/src/components/properties/InstancingNodeEditor.tsx index b05b70de49..065bda7a56 100644 --- a/packages/editor/src/components/properties/InstancingNodeEditor.tsx +++ b/packages/editor/src/components/properties/InstancingNodeEditor.tsx @@ -2,7 +2,7 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' import { Mesh, Object3D, Scene, Texture } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' import { addComponent, ComponentType, @@ -11,8 +11,8 @@ import { getOrAddComponent, hasComponent, useComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { iterateEntityNode } from '@xrengine/engine/src/ecs/functions/EntityTree' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { iterateEntityNode } from '@etherealengine/engine/src/ecs/functions/EntityTree' import { InstancingComponent, InstancingStagingComponent, @@ -24,16 +24,16 @@ import { SourceProperties, TextureRef, VertexProperties -} from '@xrengine/engine/src/scene/components/InstancingComponent' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' +} from '@etherealengine/engine/src/scene/components/InstancingComponent' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' import { GRASS_PROPERTIES_DEFAULT_VALUES, MESH_PROPERTIES_DEFAULT_VALUES -} from '@xrengine/engine/src/scene/functions/loaders/InstancingFunctions' -import getFirstMesh from '@xrengine/engine/src/scene/util/getFirstMesh' -import { State, useState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/scene/functions/loaders/InstancingFunctions' +import getFirstMesh from '@etherealengine/engine/src/scene/util/getFirstMesh' +import { State, useState } from '@etherealengine/hyperflux' import AcUnitIcon from '@mui/icons-material/AcUnit' diff --git a/packages/editor/src/components/properties/InteriorNodeEditor.tsx b/packages/editor/src/components/properties/InteriorNodeEditor.tsx index 4bd2074e0c..e14efc6f8e 100755 --- a/packages/editor/src/components/properties/InteriorNodeEditor.tsx +++ b/packages/editor/src/components/properties/InteriorNodeEditor.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { getEntityErrors } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { InteriorComponent } from '@xrengine/engine/src/scene/components/InteriorComponent' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { getEntityErrors } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { InteriorComponent } from '@etherealengine/engine/src/scene/components/InteriorComponent' import LocationCityIcon from '@mui/icons-material/LocationCity' diff --git a/packages/editor/src/components/properties/LightShadowProperties.tsx b/packages/editor/src/components/properties/LightShadowProperties.tsx index 422a85ecb1..2674f01baf 100755 --- a/packages/editor/src/components/properties/LightShadowProperties.tsx +++ b/packages/editor/src/components/properties/LightShadowProperties.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { Component, useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { Component, useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import BooleanInput from '../inputs/BooleanInput' import InputGroup from '../inputs/InputGroup' diff --git a/packages/editor/src/components/properties/LightmapBakerProperties.tsx b/packages/editor/src/components/properties/LightmapBakerProperties.tsx index 88aea9ffa1..4dc3c6e1b8 100644 --- a/packages/editor/src/components/properties/LightmapBakerProperties.tsx +++ b/packages/editor/src/components/properties/LightmapBakerProperties.tsx @@ -2,12 +2,12 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' import { LinearFilter, TextureFilter, WebGLRenderer } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { ComponentType } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { BoolArg, FloatArg, ObjectArg } from '@xrengine/engine/src/renderer/materials/constants/DefaultArgs' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { useHookstate } from '@xrengine/hyperflux' -import { State } from '@xrengine/hyperflux/functions/StateFunctions' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { ComponentType } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { BoolArg, FloatArg, ObjectArg } from '@etherealengine/engine/src/renderer/materials/constants/DefaultArgs' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { useHookstate } from '@etherealengine/hyperflux' +import { State } from '@etherealengine/hyperflux/functions/StateFunctions' import { Typography } from '@mui/material' diff --git a/packages/editor/src/components/properties/LoadVolumeNodeEditor.tsx b/packages/editor/src/components/properties/LoadVolumeNodeEditor.tsx index 5de363c0a1..6c92d8471c 100644 --- a/packages/editor/src/components/properties/LoadVolumeNodeEditor.tsx +++ b/packages/editor/src/components/properties/LoadVolumeNodeEditor.tsx @@ -1,16 +1,16 @@ import { range } from 'lodash' import React from 'react' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { Button } from '@xrengine/editor/src/components/inputs/Button' -import InputGroup from '@xrengine/editor/src/components/inputs/InputGroup' -import { SceneObjectInput } from '@xrengine/editor/src/components/inputs/SceneObjectInput' -import PaginatedList from '@xrengine/editor/src/components/layout/PaginatedList' -import Well from '@xrengine/editor/src/components/layout/Well' -import NodeEditor from '@xrengine/editor/src/components/properties/NodeEditor' -import { EditorComponentType, updateProperty } from '@xrengine/editor/src/components/properties/Util' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { LoadVolumeComponent, LoadVolumeTarget } from '@xrengine/engine/src/scene/components/LoadVolumeComponent' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { Button } from '@etherealengine/editor/src/components/inputs/Button' +import InputGroup from '@etherealengine/editor/src/components/inputs/InputGroup' +import { SceneObjectInput } from '@etherealengine/editor/src/components/inputs/SceneObjectInput' +import PaginatedList from '@etherealengine/editor/src/components/layout/PaginatedList' +import Well from '@etherealengine/editor/src/components/layout/Well' +import NodeEditor from '@etherealengine/editor/src/components/properties/NodeEditor' +import { EditorComponentType, updateProperty } from '@etherealengine/editor/src/components/properties/Util' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { LoadVolumeComponent, LoadVolumeTarget } from '@etherealengine/engine/src/scene/components/LoadVolumeComponent' import CloudSyncIcon from '@mui/icons-material/CloudSync' import { Grid } from '@mui/material' diff --git a/packages/editor/src/components/properties/MediaNodeEditor.tsx b/packages/editor/src/components/properties/MediaNodeEditor.tsx index da5b95b831..326adc9d39 100644 --- a/packages/editor/src/components/properties/MediaNodeEditor.tsx +++ b/packages/editor/src/components/properties/MediaNodeEditor.tsx @@ -1,11 +1,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { AllFileTypes } from '@xrengine/engine/src/assets/constants/fileTypes' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { getEntityErrors } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { MediaComponent } from '@xrengine/engine/src/scene/components/MediaComponent' -import { PlayMode } from '@xrengine/engine/src/scene/constants/PlayMode' +import { AllFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { getEntityErrors } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { MediaComponent } from '@etherealengine/engine/src/scene/components/MediaComponent' +import { PlayMode } from '@etherealengine/engine/src/scene/constants/PlayMode' import { SupportedFileTypes } from '../../constants/AssetTypes' import ArrayInputGroup from '../inputs/ArrayInputGroup' diff --git a/packages/editor/src/components/properties/MediaSettingsEditor.tsx b/packages/editor/src/components/properties/MediaSettingsEditor.tsx index 283951e1e7..df461436dd 100644 --- a/packages/editor/src/components/properties/MediaSettingsEditor.tsx +++ b/packages/editor/src/components/properties/MediaSettingsEditor.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { DistanceModel, DistanceModelOptions } from '@xrengine/engine/src/audio/constants/AudioConstants' -import { getMediaSceneMetadataState } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { DistanceModel, DistanceModelOptions } from '@etherealengine/engine/src/audio/constants/AudioConstants' +import { getMediaSceneMetadataState } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getState, useHookstate } from '@etherealengine/hyperflux' import BooleanInput from '../inputs/BooleanInput' import CompoundNumericInput from '../inputs/CompoundNumericInput' diff --git a/packages/editor/src/components/properties/ModelNodeEditor.tsx b/packages/editor/src/components/properties/ModelNodeEditor.tsx index 0e8b4e017c..7be7d752ef 100755 --- a/packages/editor/src/components/properties/ModelNodeEditor.tsx +++ b/packages/editor/src/components/properties/ModelNodeEditor.tsx @@ -2,10 +2,10 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' import { Object3D } from 'three' -import { AnimationManager } from '@xrengine/engine/src/avatar/AnimationManager' -import { LoopAnimationComponent } from '@xrengine/engine/src/avatar/components/LoopAnimationComponent' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' +import { AnimationManager } from '@etherealengine/engine/src/avatar/AnimationManager' +import { LoopAnimationComponent } from '@etherealengine/engine/src/avatar/components/LoopAnimationComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' import { addComponent, getComponent, @@ -14,13 +14,13 @@ import { hasComponent, removeComponent, useComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { traverseEntityNode } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { EquippableComponent } from '@xrengine/engine/src/interaction/components/EquippableComponent' -import { ErrorComponent, getEntityErrors } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { traverseEntityNode } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { EquippableComponent } from '@etherealengine/engine/src/interaction/components/EquippableComponent' +import { ErrorComponent, getEntityErrors } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' import ViewInArIcon from '@mui/icons-material/ViewInAr' diff --git a/packages/editor/src/components/properties/ModelTransformProperties.tsx b/packages/editor/src/components/properties/ModelTransformProperties.tsx index 9df8d4d72e..3f37ae90ff 100644 --- a/packages/editor/src/components/properties/ModelTransformProperties.tsx +++ b/packages/editor/src/components/properties/ModelTransformProperties.tsx @@ -3,18 +3,22 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { DoubleSide, Mesh, MeshStandardMaterial } from 'three' -import { API } from '@xrengine/client-core/src/API' -import { FileBrowserService } from '@xrengine/client-core/src/common/services/FileBrowserService' -import { ModelTransformParameters } from '@xrengine/engine/src/assets/classes/ModelTransform' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { ComponentType, getComponentState, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { MaterialSource, SourceType } from '@xrengine/engine/src/renderer/materials/components/MaterialSource' -import MeshBasicMaterial from '@xrengine/engine/src/renderer/materials/constants/material-prototypes/MeshBasicMaterial.mat' -import bakeToVertices from '@xrengine/engine/src/renderer/materials/functions/bakeToVertices' -import { materialsFromSource } from '@xrengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { useHookstate } from '@xrengine/hyperflux' -import { State } from '@xrengine/hyperflux/functions/StateFunctions' +import { API } from '@etherealengine/client-core/src/API' +import { FileBrowserService } from '@etherealengine/client-core/src/common/services/FileBrowserService' +import { ModelTransformParameters } from '@etherealengine/engine/src/assets/classes/ModelTransform' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { + ComponentType, + getComponentState, + hasComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { MaterialSource, SourceType } from '@etherealengine/engine/src/renderer/materials/components/MaterialSource' +import MeshBasicMaterial from '@etherealengine/engine/src/renderer/materials/constants/material-prototypes/MeshBasicMaterial.mat' +import bakeToVertices from '@etherealengine/engine/src/renderer/materials/functions/bakeToVertices' +import { materialsFromSource } from '@etherealengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { useHookstate } from '@etherealengine/hyperflux' +import { State } from '@etherealengine/hyperflux/functions/StateFunctions' import { ToggleButton } from '@mui/material' diff --git a/packages/editor/src/components/properties/MountPointNodeEditor.tsx b/packages/editor/src/components/properties/MountPointNodeEditor.tsx index 51f001e3fb..9ef2fa626a 100755 --- a/packages/editor/src/components/properties/MountPointNodeEditor.tsx +++ b/packages/editor/src/components/properties/MountPointNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { MountPoint, MountPointComponent } from '@xrengine/engine/src/scene/components/MountPointComponent' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { MountPoint, MountPointComponent } from '@etherealengine/engine/src/scene/components/MountPointComponent' import InputGroup from '../inputs/InputGroup' import SelectInput from '../inputs/SelectInput' diff --git a/packages/editor/src/components/properties/NameInputGroup.tsx b/packages/editor/src/components/properties/NameInputGroup.tsx index 717633a098..b99bc000c8 100755 --- a/packages/editor/src/components/properties/NameInputGroup.tsx +++ b/packages/editor/src/components/properties/NameInputGroup.tsx @@ -2,10 +2,14 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { getComponent, getOptionalComponent, useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' +import { + getComponent, + getOptionalComponent, + useComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' import { useSelectionState } from '../../services/SelectionServices' import InputGroup from '../inputs/InputGroup' diff --git a/packages/editor/src/components/properties/NodeEditor.tsx b/packages/editor/src/components/properties/NodeEditor.tsx index 7cdced069a..ed827102fd 100755 --- a/packages/editor/src/components/properties/NodeEditor.tsx +++ b/packages/editor/src/components/properties/NodeEditor.tsx @@ -1,7 +1,7 @@ import React, { PropsWithChildren } from 'react' -import { hasComponent, removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { dispatchAction } from '@xrengine/hyperflux' +import { hasComponent, removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { dispatchAction } from '@etherealengine/hyperflux' import { useEditorState } from '../../services/EditorServices' import { SelectionAction } from '../../services/SelectionServices' diff --git a/packages/editor/src/components/properties/Object3DNodeEditor.tsx b/packages/editor/src/components/properties/Object3DNodeEditor.tsx index a5ff3e273d..ca69fd4797 100755 --- a/packages/editor/src/components/properties/Object3DNodeEditor.tsx +++ b/packages/editor/src/components/properties/Object3DNodeEditor.tsx @@ -5,17 +5,17 @@ import { useTranslation } from 'react-i18next' import ReactJson from 'react-json-view' import { BoxGeometry, Euler, InstancedMesh, Material, Matrix4, Mesh, Object3D, Quaternion, Scene, Vector3 } from 'three' -import { AxisIcon } from '@xrengine/client-core/src/util/AxisIcon' -import { Geometry } from '@xrengine/engine/src/assets/constants/Geometry' -import { Deg2Rad, Rad2Deg } from '@xrengine/engine/src/common/functions/MathFunctions' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { materialFromId } from '@xrengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' -import { getMaterialLibrary } from '@xrengine/engine/src/renderer/materials/MaterialLibrary' -import { Object3DWithEntity } from '@xrengine/engine/src/scene/components/GroupComponent' -import { TransformSpace } from '@xrengine/engine/src/scene/constants/transformConstants' -import { dispatchAction, useHookstate } from '@xrengine/hyperflux' +import { AxisIcon } from '@etherealengine/client-core/src/util/AxisIcon' +import { Geometry } from '@etherealengine/engine/src/assets/constants/Geometry' +import { Deg2Rad, Rad2Deg } from '@etherealengine/engine/src/common/functions/MathFunctions' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { materialFromId } from '@etherealengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' +import { getMaterialLibrary } from '@etherealengine/engine/src/renderer/materials/MaterialLibrary' +import { Object3DWithEntity } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { TransformSpace } from '@etherealengine/engine/src/scene/constants/transformConstants' +import { dispatchAction, useHookstate } from '@etherealengine/hyperflux' import { SpaceBar } from '@mui/icons-material' import { Divider } from '@mui/material' diff --git a/packages/editor/src/components/properties/OceanNodeEditor.tsx b/packages/editor/src/components/properties/OceanNodeEditor.tsx index c983a63218..25ca721d2a 100755 --- a/packages/editor/src/components/properties/OceanNodeEditor.tsx +++ b/packages/editor/src/components/properties/OceanNodeEditor.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent, useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { ErrorComponent } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { OceanComponent } from '@xrengine/engine/src/scene/components/OceanComponent' +import { getComponent, useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { ErrorComponent } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { OceanComponent } from '@etherealengine/engine/src/scene/components/OceanComponent' import WaterIcon from '@mui/icons-material/Water' diff --git a/packages/editor/src/components/properties/ParticleSystemNodeEditor.tsx b/packages/editor/src/components/properties/ParticleSystemNodeEditor.tsx index 40e4d55941..748a506da7 100644 --- a/packages/editor/src/components/properties/ParticleSystemNodeEditor.tsx +++ b/packages/editor/src/components/properties/ParticleSystemNodeEditor.tsx @@ -11,7 +11,7 @@ import { } from 'three' import { RenderMode } from 'three.quarks/dist/three.quarks' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import { ApplyForceBehaviorJSON, BehaviorJSON, @@ -23,8 +23,8 @@ import { POINT_SHAPE_DEFAULT, SPHERE_SHAPE_DEFAULT, ValueGeneratorJSON -} from '@xrengine/engine/src/scene/components/ParticleSystemComponent' -import { State } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/scene/components/ParticleSystemComponent' +import { State } from '@etherealengine/hyperflux' import { ScatterPlotOutlined } from '@mui/icons-material' diff --git a/packages/editor/src/components/properties/PersistentAnchorNodeEditor.tsx b/packages/editor/src/components/properties/PersistentAnchorNodeEditor.tsx index 65ea2ada89..768d1a8ff1 100644 --- a/packages/editor/src/components/properties/PersistentAnchorNodeEditor.tsx +++ b/packages/editor/src/components/properties/PersistentAnchorNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { PersistentAnchorComponent } from '@xrengine/engine/src/xr/XRAnchorComponents' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { PersistentAnchorComponent } from '@etherealengine/engine/src/xr/XRAnchorComponents' import InputGroup from '../inputs/InputGroup' import StringInput from '../inputs/StringInput' diff --git a/packages/editor/src/components/properties/PointLightNodeEditor.tsx b/packages/editor/src/components/properties/PointLightNodeEditor.tsx index 4ea0b73238..350e5ce764 100755 --- a/packages/editor/src/components/properties/PointLightNodeEditor.tsx +++ b/packages/editor/src/components/properties/PointLightNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { PointLightComponent } from '@xrengine/engine/src/scene/components/PointLightComponent' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { PointLightComponent } from '@etherealengine/engine/src/scene/components/PointLightComponent' import LightbulbIcon from '@mui/icons-material/Lightbulb' diff --git a/packages/editor/src/components/properties/PortalNodeEditor.tsx b/packages/editor/src/components/properties/PortalNodeEditor.tsx index 96841f96e7..e3da09fb0a 100755 --- a/packages/editor/src/components/properties/PortalNodeEditor.tsx +++ b/packages/editor/src/components/properties/PortalNodeEditor.tsx @@ -2,17 +2,17 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Euler, Quaternion } from 'three' -import { API } from '@xrengine/client-core/src/API' -import { PortalDetail } from '@xrengine/common/src/interfaces/PortalInterface' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' +import { API } from '@etherealengine/client-core/src/API' +import { PortalDetail } from '@etherealengine/common/src/interfaces/PortalInterface' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' import { PortalComponent, PortalEffects, PortalPreviewTypes -} from '@xrengine/engine/src/scene/components/PortalComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' +} from '@etherealengine/engine/src/scene/components/PortalComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' import MeetingRoomIcon from '@mui/icons-material/MeetingRoom' diff --git a/packages/editor/src/components/properties/PositionalAudioNodeEditor.tsx b/packages/editor/src/components/properties/PositionalAudioNodeEditor.tsx index 8ab6a7ce03..70aa18a39c 100755 --- a/packages/editor/src/components/properties/PositionalAudioNodeEditor.tsx +++ b/packages/editor/src/components/properties/PositionalAudioNodeEditor.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { PositionalAudioComponent } from '@xrengine/engine/src/audio/components/PositionalAudioComponent' -import { DistanceModel, DistanceModelOptions } from '@xrengine/engine/src/audio/constants/AudioConstants' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +import { PositionalAudioComponent } from '@etherealengine/engine/src/audio/components/PositionalAudioComponent' +import { DistanceModel, DistanceModelOptions } from '@etherealengine/engine/src/audio/constants/AudioConstants' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import VolumeUpIcon from '@mui/icons-material/VolumeUp' diff --git a/packages/editor/src/components/properties/PostProcessingSettingsEditor.tsx b/packages/editor/src/components/properties/PostProcessingSettingsEditor.tsx index 944bb0b4a8..dd0b71f8c4 100755 --- a/packages/editor/src/components/properties/PostProcessingSettingsEditor.tsx +++ b/packages/editor/src/components/properties/PostProcessingSettingsEditor.tsx @@ -3,11 +3,11 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' import { Color } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { configureEffectComposer } from '@xrengine/engine/src/renderer/functions/configureEffectComposer' -import { getPostProcessingSceneMetadataState } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { Effects } from '@xrengine/engine/src/scene/constants/PostProcessing' -import { useHookstate } from '@xrengine/hyperflux' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { configureEffectComposer } from '@etherealengine/engine/src/renderer/functions/configureEffectComposer' +import { getPostProcessingSceneMetadataState } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { Effects } from '@etherealengine/engine/src/scene/constants/PostProcessing' +import { useHookstate } from '@etherealengine/hyperflux' import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp' diff --git a/packages/editor/src/components/properties/PrefabNodeEditor.tsx b/packages/editor/src/components/properties/PrefabNodeEditor.tsx index 0af9b11138..bfef655526 100644 --- a/packages/editor/src/components/properties/PrefabNodeEditor.tsx +++ b/packages/editor/src/components/properties/PrefabNodeEditor.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { LoadState, PrefabComponent } from '@xrengine/engine/src/scene/components/PrefabComponent' -import { loadPrefab, unloadPrefab } from '@xrengine/engine/src/scene/functions/loaders/PrefabComponentFunctions' -import { dispatchAction } from '@xrengine/hyperflux' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { LoadState, PrefabComponent } from '@etherealengine/engine/src/scene/components/PrefabComponent' +import { loadPrefab, unloadPrefab } from '@etherealengine/engine/src/scene/functions/loaders/PrefabComponentFunctions' +import { dispatchAction } from '@etherealengine/hyperflux' import { exportPrefab } from '../../functions/assetFunctions' import { EditorAction } from '../../services/EditorServices' diff --git a/packages/editor/src/components/properties/PropertiesPanelContainer.tsx b/packages/editor/src/components/properties/PropertiesPanelContainer.tsx index 4520b4e93d..667124647f 100755 --- a/packages/editor/src/components/properties/PropertiesPanelContainer.tsx +++ b/packages/editor/src/components/properties/PropertiesPanelContainer.tsx @@ -3,14 +3,14 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { Object3D } from 'three' -import { useForceUpdate } from '@xrengine/common/src/utils/useForceUpdate' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getAllComponents } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { MaterialComponentType } from '@xrengine/engine/src/renderer/materials/components/MaterialComponent' -import { getMaterialLibrary } from '@xrengine/engine/src/renderer/materials/MaterialLibrary' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' +import { useForceUpdate } from '@etherealengine/common/src/utils/useForceUpdate' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getAllComponents } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { MaterialComponentType } from '@etherealengine/engine/src/renderer/materials/components/MaterialComponent' +import { getMaterialLibrary } from '@etherealengine/engine/src/renderer/materials/MaterialLibrary' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' import { EntityNodeEditor } from '../../functions/PrefabEditors' import { useEditorState } from '../../services/EditorServices' diff --git a/packages/editor/src/components/properties/PropertiesPanelTitle.tsx b/packages/editor/src/components/properties/PropertiesPanelTitle.tsx index 5dfebd59ef..b691604e0e 100644 --- a/packages/editor/src/components/properties/PropertiesPanelTitle.tsx +++ b/packages/editor/src/components/properties/PropertiesPanelTitle.tsx @@ -1,9 +1,9 @@ import React from 'react' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import { dispatchAction } from '@xrengine/hyperflux' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import { dispatchAction } from '@etherealengine/hyperflux' import LockIcon from '@mui/icons-material/Lock' import UnlockIcon from '@mui/icons-material/LockOpen' diff --git a/packages/editor/src/components/properties/RenderSettingsEditor.tsx b/packages/editor/src/components/properties/RenderSettingsEditor.tsx index e9377f76ff..fce3dfe36a 100644 --- a/packages/editor/src/components/properties/RenderSettingsEditor.tsx +++ b/packages/editor/src/components/properties/RenderSettingsEditor.tsx @@ -15,9 +15,9 @@ import { VSMShadowMap } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getRendererSceneMetadataState } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getRendererSceneMetadataState } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { getState, useHookstate } from '@etherealengine/hyperflux' import BooleanInput from '../inputs/BooleanInput' import CompoundNumericInput from '../inputs/CompoundNumericInput' diff --git a/packages/editor/src/components/properties/ScenePreviewCameraNodeEditor.tsx b/packages/editor/src/components/properties/ScenePreviewCameraNodeEditor.tsx index 346d60902f..d4e8ba70a7 100755 --- a/packages/editor/src/components/properties/ScenePreviewCameraNodeEditor.tsx +++ b/packages/editor/src/components/properties/ScenePreviewCameraNodeEditor.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getComponent, setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getComponent, setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import { LocalTransformComponent, TransformComponent -} from '@xrengine/engine/src/transform/components/TransformComponent' +} from '@etherealengine/engine/src/transform/components/TransformComponent' import CameraAltIcon from '@mui/icons-material/CameraAlt' diff --git a/packages/editor/src/components/properties/ScreenshareTargetNodeEditor.tsx b/packages/editor/src/components/properties/ScreenshareTargetNodeEditor.tsx index a27e4bb5e0..3d6286116a 100644 --- a/packages/editor/src/components/properties/ScreenshareTargetNodeEditor.tsx +++ b/packages/editor/src/components/properties/ScreenshareTargetNodeEditor.tsx @@ -1,8 +1,12 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { addComponent, hasComponent, removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { ScreenshareTargetComponent } from '@xrengine/engine/src/scene/components/ScreenshareTargetComponent' +import { + addComponent, + hasComponent, + removeComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { ScreenshareTargetComponent } from '@etherealengine/engine/src/scene/components/ScreenshareTargetComponent' import ScreenShareIcon from '@mui/icons-material/ScreenShare' diff --git a/packages/editor/src/components/properties/ShadowProperties.tsx b/packages/editor/src/components/properties/ShadowProperties.tsx index 0f95bdb204..567350b769 100644 --- a/packages/editor/src/components/properties/ShadowProperties.tsx +++ b/packages/editor/src/components/properties/ShadowProperties.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { ShadowComponent } from '@xrengine/engine/src/scene/components/ShadowComponent' +import { getComponent, hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { ShadowComponent } from '@etherealengine/engine/src/scene/components/ShadowComponent' import BooleanInput from '../inputs/BooleanInput' import InputGroup from '../inputs/InputGroup' diff --git a/packages/editor/src/components/properties/SkyboxNodeEditor.tsx b/packages/editor/src/components/properties/SkyboxNodeEditor.tsx index 990bbe786a..b07691b1f9 100755 --- a/packages/editor/src/components/properties/SkyboxNodeEditor.tsx +++ b/packages/editor/src/components/properties/SkyboxNodeEditor.tsx @@ -2,16 +2,16 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Color } from 'three' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' import { ComponentType, getComponent, hasComponent, useComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { ErrorComponent, getEntityErrors } from '@xrengine/engine/src/scene/components/ErrorComponent' -import { SkyboxComponent } from '@xrengine/engine/src/scene/components/SkyboxComponent' -import { SkyTypeEnum } from '@xrengine/engine/src/scene/constants/SkyTypeEnum' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { ErrorComponent, getEntityErrors } from '@etherealengine/engine/src/scene/components/ErrorComponent' +import { SkyboxComponent } from '@etherealengine/engine/src/scene/components/SkyboxComponent' +import { SkyTypeEnum } from '@etherealengine/engine/src/scene/constants/SkyTypeEnum' import CloudIcon from '@mui/icons-material/Cloud' diff --git a/packages/editor/src/components/properties/SpawnPointNodeEditor.tsx b/packages/editor/src/components/properties/SpawnPointNodeEditor.tsx index ca75f98611..855fbfae7b 100755 --- a/packages/editor/src/components/properties/SpawnPointNodeEditor.tsx +++ b/packages/editor/src/components/properties/SpawnPointNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { SpawnPointComponent } from '@xrengine/engine/src/scene/components/SpawnPointComponent' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { SpawnPointComponent } from '@etherealengine/engine/src/scene/components/SpawnPointComponent' import StreetviewIcon from '@mui/icons-material/Streetview' diff --git a/packages/editor/src/components/properties/SplineNodeEditor.tsx b/packages/editor/src/components/properties/SplineNodeEditor.tsx index f018901158..3e7dcac171 100644 --- a/packages/editor/src/components/properties/SplineNodeEditor.tsx +++ b/packages/editor/src/components/properties/SplineNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' import TimelineIcon from '@mui/icons-material/Timeline' diff --git a/packages/editor/src/components/properties/SpotLightNodeEditor.tsx b/packages/editor/src/components/properties/SpotLightNodeEditor.tsx index cb19ba4688..4212bbb273 100755 --- a/packages/editor/src/components/properties/SpotLightNodeEditor.tsx +++ b/packages/editor/src/components/properties/SpotLightNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { SpotLightComponent } from '@xrengine/engine/src/scene/components/SpotLightComponent' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { SpotLightComponent } from '@etherealengine/engine/src/scene/components/SpotLightComponent' import AdjustIcon from '@mui/icons-material/Adjust' diff --git a/packages/editor/src/components/properties/SystemNodeEditor.tsx b/packages/editor/src/components/properties/SystemNodeEditor.tsx index 344e5dc712..3b6f3e4ce6 100644 --- a/packages/editor/src/components/properties/SystemNodeEditor.tsx +++ b/packages/editor/src/components/properties/SystemNodeEditor.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { validatePath } from '@xrengine/common/src/utils/validatePath' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { SystemUpdateType } from '@xrengine/engine/src/ecs/functions/SystemUpdateType' -import { SystemComponent } from '@xrengine/engine/src/scene/components/SystemComponent' +import { validatePath } from '@etherealengine/common/src/utils/validatePath' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { SystemUpdateType } from '@etherealengine/engine/src/ecs/functions/SystemUpdateType' +import { SystemComponent } from '@etherealengine/engine/src/scene/components/SystemComponent' import ExtensionIcon from '@mui/icons-material/Extension' diff --git a/packages/editor/src/components/properties/TransformPropertyGroup.tsx b/packages/editor/src/components/properties/TransformPropertyGroup.tsx index 8ca549fb74..cee5c53406 100755 --- a/packages/editor/src/components/properties/TransformPropertyGroup.tsx +++ b/packages/editor/src/components/properties/TransformPropertyGroup.tsx @@ -2,19 +2,19 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Euler } from 'three' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import { getComponent, hasComponent, useComponent, useOptionalComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { getEntityNodeArrayFromEntities } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { SceneDynamicLoadTagComponent } from '@xrengine/engine/src/scene/components/SceneDynamicLoadTagComponent' -import { TransformSpace } from '@xrengine/engine/src/scene/constants/transformConstants' -import { LocalTransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { dispatchAction, getState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { getEntityNodeArrayFromEntities } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { SceneDynamicLoadTagComponent } from '@etherealengine/engine/src/scene/components/SceneDynamicLoadTagComponent' +import { TransformSpace } from '@etherealengine/engine/src/scene/constants/transformConstants' +import { LocalTransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { EditorControlFunctions } from '../../functions/EditorControlFunctions' import { EditorHistoryAction } from '../../services/EditorHistory' diff --git a/packages/editor/src/components/properties/Util.ts b/packages/editor/src/components/properties/Util.ts index 258f4bbd2d..10d7e4e0b7 100644 --- a/packages/editor/src/components/properties/Util.ts +++ b/packages/editor/src/components/properties/Util.ts @@ -1,15 +1,15 @@ -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { Component, ComponentType, SerializedComponentType -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID, getEntityNodeArrayFromEntities } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { iterateEntityNode } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import { dispatchAction, getState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID, getEntityNodeArrayFromEntities } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { iterateEntityNode } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { EditorControlFunctions } from '../../functions/EditorControlFunctions' import { EditorHistoryAction } from '../../services/EditorHistory' diff --git a/packages/editor/src/components/properties/VideoNodeEditor.tsx b/packages/editor/src/components/properties/VideoNodeEditor.tsx index 110cc9b405..b3739cc2ef 100755 --- a/packages/editor/src/components/properties/VideoNodeEditor.tsx +++ b/packages/editor/src/components/properties/VideoNodeEditor.tsx @@ -2,18 +2,18 @@ import { useState } from '@hookstate/core' import React from 'react' import { useTranslation } from 'react-i18next' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' import { defineQuery, getComponent, useComponent, useQuery -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { MediaComponent } from '@xrengine/engine/src/scene/components/MediaComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import { VideoComponent } from '@xrengine/engine/src/scene/components/VideoComponent' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { MediaComponent } from '@etherealengine/engine/src/scene/components/MediaComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import { VideoComponent } from '@etherealengine/engine/src/scene/components/VideoComponent' import VideocamIcon from '@mui/icons-material/Videocam' diff --git a/packages/editor/src/components/properties/VolumetricNodeEditor.tsx b/packages/editor/src/components/properties/VolumetricNodeEditor.tsx index 7b63af4b54..5515e60c98 100755 --- a/packages/editor/src/components/properties/VolumetricNodeEditor.tsx +++ b/packages/editor/src/components/properties/VolumetricNodeEditor.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { VolumetricComponent } from '@xrengine/engine/src/scene/components/VolumetricComponent' +import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { VolumetricComponent } from '@etherealengine/engine/src/scene/components/VolumetricComponent' import VideocamIcon from '@mui/icons-material/Videocam' diff --git a/packages/editor/src/components/properties/WaterNodeEditor.tsx b/packages/editor/src/components/properties/WaterNodeEditor.tsx index 41ae7354a8..0da9d430d9 100755 --- a/packages/editor/src/components/properties/WaterNodeEditor.tsx +++ b/packages/editor/src/components/properties/WaterNodeEditor.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import WaterIcon from '@mui/icons-material/Water' diff --git a/packages/editor/src/components/properties/three.quarks/BehaviorInput.tsx b/packages/editor/src/components/properties/three.quarks/BehaviorInput.tsx index 9b8616ad30..7812a87895 100644 --- a/packages/editor/src/components/properties/three.quarks/BehaviorInput.tsx +++ b/packages/editor/src/components/properties/three.quarks/BehaviorInput.tsx @@ -17,8 +17,8 @@ import { SizeOverLifeBehaviorJSON, SpeedOverLifeBehaviorJSON, WidthOverLengthBehaviorJSON -} from '@xrengine/engine/src/scene/components/ParticleSystemComponent' -import { State } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/scene/components/ParticleSystemComponent' +import { State } from '@etherealengine/hyperflux' import InputGroup from '../../inputs/InputGroup' import NumericInputGroup from '../../inputs/NumericInputGroup' diff --git a/packages/editor/src/components/properties/three.quarks/ColorGenerator.tsx b/packages/editor/src/components/properties/three.quarks/ColorGenerator.tsx index ebb40c1b8f..00e4e19c7f 100644 --- a/packages/editor/src/components/properties/three.quarks/ColorGenerator.tsx +++ b/packages/editor/src/components/properties/three.quarks/ColorGenerator.tsx @@ -10,8 +10,8 @@ import { ColorRangeJSON, ConstantColorJSON, RandomColorJSON -} from '@xrengine/engine/src/scene/components/ParticleSystemComponent' -import { State } from '@xrengine/hyperflux/functions/StateFunctions' +} from '@etherealengine/engine/src/scene/components/ParticleSystemComponent' +import { State } from '@etherealengine/hyperflux/functions/StateFunctions' import ColorInput from '../../inputs/ColorInput' import InputGroup from '../../inputs/InputGroup' diff --git a/packages/editor/src/components/properties/three.quarks/ValueGenerator.tsx b/packages/editor/src/components/properties/three.quarks/ValueGenerator.tsx index 67ee6ffc56..15f10d6888 100644 --- a/packages/editor/src/components/properties/three.quarks/ValueGenerator.tsx +++ b/packages/editor/src/components/properties/three.quarks/ValueGenerator.tsx @@ -3,8 +3,8 @@ import React, { useCallback } from 'react' import { ValueGeneratorJSON, ValueGeneratorJSONDefaults -} from '@xrengine/engine/src/scene/components/ParticleSystemComponent' -import { State } from '@xrengine/hyperflux/functions/StateFunctions' +} from '@etherealengine/engine/src/scene/components/ParticleSystemComponent' +import { State } from '@etherealengine/hyperflux/functions/StateFunctions' import InputGroup from '../../inputs/InputGroup' import NumericInputGroup from '../../inputs/NumericInputGroup' diff --git a/packages/editor/src/components/realtime/EditorActiveInstanceService.ts b/packages/editor/src/components/realtime/EditorActiveInstanceService.ts index 0ace5fc5df..7b3ae00625 100644 --- a/packages/editor/src/components/realtime/EditorActiveInstanceService.ts +++ b/packages/editor/src/components/realtime/EditorActiveInstanceService.ts @@ -1,12 +1,12 @@ import { useEffect } from 'react' -import { API } from '@xrengine/client-core/src/API' -import { LocationInstanceConnectionAction } from '@xrengine/client-core/src/common/services/LocationInstanceConnectionService' -import { accessAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import logger from '@xrengine/common/src/logger' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' +import { API } from '@etherealengine/client-core/src/API' +import { LocationInstanceConnectionAction } from '@etherealengine/client-core/src/common/services/LocationInstanceConnectionService' +import { accessAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import logger from '@etherealengine/common/src/logger' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { accessEditorState } from '../../services/EditorServices' diff --git a/packages/editor/src/components/realtime/WorldInstanceConnection.tsx b/packages/editor/src/components/realtime/WorldInstanceConnection.tsx index 3d48b8ad4e..f5c170db64 100644 --- a/packages/editor/src/components/realtime/WorldInstanceConnection.tsx +++ b/packages/editor/src/components/realtime/WorldInstanceConnection.tsx @@ -6,12 +6,12 @@ import { LocationInstanceConnectionServiceReceptor, useLocationInstanceConnectionState, useWorldInstance -} from '@xrengine/client-core/src/common/services/LocationInstanceConnectionService' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import { leaveNetwork } from '@xrengine/client-core/src/transports/SocketWebRTCClientFunctions' -import { SocketWebRTCClientNetwork } from '@xrengine/client-core/src/transports/SocketWebRTCClientNetwork' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { addActionReceptor, dispatchAction, removeActionReceptor } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/common/services/LocationInstanceConnectionService' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import { leaveNetwork } from '@etherealengine/client-core/src/transports/SocketWebRTCClientFunctions' +import { SocketWebRTCClientNetwork } from '@etherealengine/client-core/src/transports/SocketWebRTCClientNetwork' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { addActionReceptor, dispatchAction, removeActionReceptor } from '@etherealengine/hyperflux' import DirectionsRun from '@mui/icons-material/DirectionsRun' import DoneIcon from '@mui/icons-material/Done' diff --git a/packages/editor/src/components/realtime/useEditorNetworkInstanceProvisioning.tsx b/packages/editor/src/components/realtime/useEditorNetworkInstanceProvisioning.tsx index cda16f01f0..ad5424779b 100644 --- a/packages/editor/src/components/realtime/useEditorNetworkInstanceProvisioning.tsx +++ b/packages/editor/src/components/realtime/useEditorNetworkInstanceProvisioning.tsx @@ -4,10 +4,10 @@ import { LocationInstanceConnectionService, useLocationInstanceConnectionState, useWorldInstance -} from '@xrengine/client-core/src/common/services/LocationInstanceConnectionService' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { useHookstate } from '@xrengine/hyperflux' +} from '@etherealengine/client-core/src/common/services/LocationInstanceConnectionService' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { useHookstate } from '@etherealengine/hyperflux' export const useEditorNetworkInstanceProvisioning = () => { const engineState = useEngineState() diff --git a/packages/editor/src/components/toolbar/tools/AdvancedModeTool.tsx b/packages/editor/src/components/toolbar/tools/AdvancedModeTool.tsx index 99de81513d..f08b6780f6 100644 --- a/packages/editor/src/components/toolbar/tools/AdvancedModeTool.tsx +++ b/packages/editor/src/components/toolbar/tools/AdvancedModeTool.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { dispatchAction } from '@xrengine/hyperflux' +import { dispatchAction } from '@etherealengine/hyperflux' import { EditorAction, useEditorState } from '../../../services/EditorServices' import { InfoTooltip } from '../../layout/Tooltip' diff --git a/packages/editor/src/components/toolbar/tools/GridTool.tsx b/packages/editor/src/components/toolbar/tools/GridTool.tsx index fefe10d89d..52f57342bf 100644 --- a/packages/editor/src/components/toolbar/tools/GridTool.tsx +++ b/packages/editor/src/components/toolbar/tools/GridTool.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { RendererState } from '@xrengine/engine/src/renderer/RendererState' -import InfiniteGridHelper from '@xrengine/engine/src/scene/classes/InfiniteGridHelper' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { RendererState } from '@etherealengine/engine/src/renderer/RendererState' +import InfiniteGridHelper from '@etherealengine/engine/src/scene/classes/InfiniteGridHelper' +import { getState, useHookstate } from '@etherealengine/hyperflux' import GridOnIcon from '@mui/icons-material/GridOn' diff --git a/packages/editor/src/components/toolbar/tools/HelperToggleTool.tsx b/packages/editor/src/components/toolbar/tools/HelperToggleTool.tsx index bb4895478c..dbd6428d80 100644 --- a/packages/editor/src/components/toolbar/tools/HelperToggleTool.tsx +++ b/packages/editor/src/components/toolbar/tools/HelperToggleTool.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { RendererState } from '@xrengine/engine/src/renderer/RendererState' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { RendererState } from '@etherealengine/engine/src/renderer/RendererState' +import { getState, useHookstate } from '@etherealengine/hyperflux' import SelectAllIcon from '@mui/icons-material/SelectAll' import SquareFootIcon from '@mui/icons-material/SquareFoot' diff --git a/packages/editor/src/components/toolbar/tools/PlayModeTool.tsx b/packages/editor/src/components/toolbar/tools/PlayModeTool.tsx index ff2b5f8e8f..bbe6659681 100644 --- a/packages/editor/src/components/toolbar/tools/PlayModeTool.tsx +++ b/packages/editor/src/components/toolbar/tools/PlayModeTool.tsx @@ -1,16 +1,16 @@ import React from 'react' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { getRandomSpawnPoint } from '@xrengine/engine/src/avatar/AvatarSpawnSystem' -import { FollowCameraComponent } from '@xrengine/engine/src/camera/components/FollowCameraComponent' -import { TargetCameraRotationComponent } from '@xrengine/engine/src/camera/components/TargetCameraRotationComponent' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getEngineState, useEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { getComponent, removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { removeEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { spawnLocalAvatarInWorld } from '@xrengine/engine/src/networking/functions/receiveJoinWorld' -import { ComputedTransformComponent } from '@xrengine/engine/src/transform/components/ComputedTransformComponent' -import { dispatchAction } from '@xrengine/hyperflux' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { getRandomSpawnPoint } from '@etherealengine/engine/src/avatar/AvatarSpawnSystem' +import { FollowCameraComponent } from '@etherealengine/engine/src/camera/components/FollowCameraComponent' +import { TargetCameraRotationComponent } from '@etherealengine/engine/src/camera/components/TargetCameraRotationComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getEngineState, useEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { getComponent, removeComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { spawnLocalAvatarInWorld } from '@etherealengine/engine/src/networking/functions/receiveJoinWorld' +import { ComputedTransformComponent } from '@etherealengine/engine/src/transform/components/ComputedTransformComponent' +import { dispatchAction } from '@etherealengine/hyperflux' import PauseIcon from '@mui/icons-material/Pause' import PlayArrowIcon from '@mui/icons-material/PlayArrow' diff --git a/packages/editor/src/components/toolbar/tools/RenderModeTool.tsx b/packages/editor/src/components/toolbar/tools/RenderModeTool.tsx index a3affe1042..c5eb491a97 100644 --- a/packages/editor/src/components/toolbar/tools/RenderModeTool.tsx +++ b/packages/editor/src/components/toolbar/tools/RenderModeTool.tsx @@ -1,9 +1,9 @@ import React from 'react' -import { RenderModesType } from '@xrengine/engine/src/renderer/constants/RenderModes' -import { RenderModes } from '@xrengine/engine/src/renderer/constants/RenderModes' -import { RendererState } from '@xrengine/engine/src/renderer/RendererState' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { RenderModesType } from '@etherealengine/engine/src/renderer/constants/RenderModes' +import { RenderModes } from '@etherealengine/engine/src/renderer/constants/RenderModes' +import { RendererState } from '@etherealengine/engine/src/renderer/RendererState' +import { getState, useHookstate } from '@etherealengine/hyperflux' import WbSunnyOutlinedIcon from '@mui/icons-material/WbSunnyOutlined' diff --git a/packages/editor/src/components/toolbar/tools/TransformPivotTool.tsx b/packages/editor/src/components/toolbar/tools/TransformPivotTool.tsx index 9d31d3336c..1b7b641136 100644 --- a/packages/editor/src/components/toolbar/tools/TransformPivotTool.tsx +++ b/packages/editor/src/components/toolbar/tools/TransformPivotTool.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { TransformPivot } from '@xrengine/engine/src/scene/constants/transformConstants' +import { TransformPivot } from '@etherealengine/engine/src/scene/constants/transformConstants' import AdjustIcon from '@mui/icons-material/Adjust' diff --git a/packages/editor/src/components/toolbar/tools/TransformSnapTool.tsx b/packages/editor/src/components/toolbar/tools/TransformSnapTool.tsx index cc945024f5..eccdab75c6 100644 --- a/packages/editor/src/components/toolbar/tools/TransformSnapTool.tsx +++ b/packages/editor/src/components/toolbar/tools/TransformSnapTool.tsx @@ -1,8 +1,8 @@ import React from 'react' -import InfiniteGridHelper from '@xrengine/engine/src/scene/classes/InfiniteGridHelper' -import { SnapMode } from '@xrengine/engine/src/scene/constants/transformConstants' -import { dispatchAction } from '@xrengine/hyperflux' +import InfiniteGridHelper from '@etherealengine/engine/src/scene/classes/InfiniteGridHelper' +import { SnapMode } from '@etherealengine/engine/src/scene/constants/transformConstants' +import { dispatchAction } from '@etherealengine/hyperflux' import AttractionsIcon from '@mui/icons-material/Attractions' diff --git a/packages/editor/src/components/toolbar/tools/TransformSpaceTool.tsx b/packages/editor/src/components/toolbar/tools/TransformSpaceTool.tsx index be7406068a..176063d752 100644 --- a/packages/editor/src/components/toolbar/tools/TransformSpaceTool.tsx +++ b/packages/editor/src/components/toolbar/tools/TransformSpaceTool.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { TransformSpace } from '@xrengine/engine/src/scene/constants/transformConstants' +import { TransformSpace } from '@etherealengine/engine/src/scene/constants/transformConstants' import LanguageIcon from '@mui/icons-material/Language' diff --git a/packages/editor/src/components/toolbar/tools/TransformTool.tsx b/packages/editor/src/components/toolbar/tools/TransformTool.tsx index da6d12f580..1c6270a872 100644 --- a/packages/editor/src/components/toolbar/tools/TransformTool.tsx +++ b/packages/editor/src/components/toolbar/tools/TransformTool.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { TransformMode } from '@xrengine/engine/src/scene/constants/transformConstants' +import { TransformMode } from '@etherealengine/engine/src/scene/constants/transformConstants' import HeightIcon from '@mui/icons-material/Height' import OpenWithIcon from '@mui/icons-material/OpenWith' diff --git a/packages/editor/src/constants/AssetTypes.ts b/packages/editor/src/constants/AssetTypes.ts index 193875f008..91a627dba2 100644 --- a/packages/editor/src/constants/AssetTypes.ts +++ b/packages/editor/src/constants/AssetTypes.ts @@ -1,6 +1,6 @@ import { NativeTypes } from 'react-dnd-html5-backend' -import { AssetType } from '@xrengine/engine/src/assets/enum/AssetType' +import { AssetType } from '@etherealengine/engine/src/assets/enum/AssetType' /** * ItemTypes object containing types of items used. diff --git a/packages/editor/src/functions/EditorControlFunctions.test.ts b/packages/editor/src/functions/EditorControlFunctions.test.ts index affb3d0592..b602510c43 100644 --- a/packages/editor/src/functions/EditorControlFunctions.test.ts +++ b/packages/editor/src/functions/EditorControlFunctions.test.ts @@ -1,35 +1,35 @@ import assert from 'assert' import { Vector3 } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' import { addComponent, createMappedComponent, getComponent, hasComponent, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity, entityExists } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { addEntityNodeChild, EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { createEngine } from '@xrengine/engine/src/initializeEngine' -import { GroupComponent, SCENE_COMPONENT_GROUP } from '@xrengine/engine/src/scene/components/GroupComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { SCENE_COMPONENT_VISIBLE, VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' -import { ScenePrefabs } from '@xrengine/engine/src/scene/systems/SceneObjectUpdateSystem' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity, entityExists } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { addEntityNodeChild, EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { createEngine } from '@etherealengine/engine/src/initializeEngine' +import { GroupComponent, SCENE_COMPONENT_GROUP } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { SCENE_COMPONENT_VISIBLE, VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' +import { ScenePrefabs } from '@etherealengine/engine/src/scene/systems/SceneObjectUpdateSystem' import { SCENE_COMPONENT_TRANSFORM, SCENE_COMPONENT_TRANSFORM_DEFAULT_VALUES, TransformComponent -} from '@xrengine/engine/src/transform/components/TransformComponent' -import { applyIncomingActions } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/transform/components/TransformComponent' +import { applyIncomingActions } from '@etherealengine/hyperflux' import { deregisterEditorReceptors, registerEditorReceptors } from '../services/EditorServicesReceptor' import { EditorControlFunctions } from './EditorControlFunctions' -import '@xrengine/engine/src/patchEngineNode' +import '@etherealengine/engine/src/patchEngineNode' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { deserializeGroup } from '@xrengine/engine/src/scene/functions/loaders/GroupFunctions' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { deserializeGroup } from '@etherealengine/engine/src/scene/functions/loaders/GroupFunctions' import { createTransformGizmo } from '../systems/EditorControlSystem' diff --git a/packages/editor/src/functions/EditorControlFunctions.ts b/packages/editor/src/functions/EditorControlFunctions.ts index 7795af7c53..4d91389215 100644 --- a/packages/editor/src/functions/EditorControlFunctions.ts +++ b/packages/editor/src/functions/EditorControlFunctions.ts @@ -1,12 +1,12 @@ import { command } from 'cli' import { Euler, Material, Matrix4, Mesh, Quaternion, Vector3 } from 'three' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { EntityJson, SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import logger from '@xrengine/common/src/logger' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { EntityJson, SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import logger from '@etherealengine/common/src/logger' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import { addComponent, Component, @@ -18,8 +18,8 @@ import { SerializedComponentType, setComponent, updateComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity, removeEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity, removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' import { addEntityNodeChild, EntityOrObjectUUID, @@ -29,31 +29,34 @@ import { removeEntityNodeRecursively, reparentEntityNode, traverseEntityNode -} from '@xrengine/engine/src/ecs/functions/EntityTree' -import { materialFromId } from '@xrengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' -import { getMaterialLibrary } from '@xrengine/engine/src/renderer/materials/MaterialLibrary' -import { ColliderComponent } from '@xrengine/engine/src/scene/components/ColliderComponent' -import { GLTFLoadedComponent } from '@xrengine/engine/src/scene/components/GLTFLoadedComponent' -import { GroupComponent, Object3DWithEntity } from '@xrengine/engine/src/scene/components/GroupComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { UUIDComponent } from '@xrengine/engine/src/scene/components/UUIDComponent' -import { TransformSpace } from '@xrengine/engine/src/scene/constants/transformConstants' -import { getUniqueName } from '@xrengine/engine/src/scene/functions/getUniqueName' -import { reparentObject3D } from '@xrengine/engine/src/scene/functions/ReparentFunction' -import { serializeEntity, serializeWorld } from '@xrengine/engine/src/scene/functions/serializeWorld' -import { createNewEditorNode, deserializeSceneEntity } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -import { ScenePrefabs } from '@xrengine/engine/src/scene/systems/SceneObjectUpdateSystem' -import obj3dFromUuid from '@xrengine/engine/src/scene/util/obj3dFromUuid' +} from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { materialFromId } from '@etherealengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' +import { getMaterialLibrary } from '@etherealengine/engine/src/renderer/materials/MaterialLibrary' +import { ColliderComponent } from '@etherealengine/engine/src/scene/components/ColliderComponent' +import { GLTFLoadedComponent } from '@etherealengine/engine/src/scene/components/GLTFLoadedComponent' +import { GroupComponent, Object3DWithEntity } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDComponent' +import { TransformSpace } from '@etherealengine/engine/src/scene/constants/transformConstants' +import { getUniqueName } from '@etherealengine/engine/src/scene/functions/getUniqueName' +import { reparentObject3D } from '@etherealengine/engine/src/scene/functions/ReparentFunction' +import { serializeEntity, serializeWorld } from '@etherealengine/engine/src/scene/functions/serializeWorld' +import { + createNewEditorNode, + deserializeSceneEntity +} from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +import { ScenePrefabs } from '@etherealengine/engine/src/scene/systems/SceneObjectUpdateSystem' +import obj3dFromUuid from '@etherealengine/engine/src/scene/util/obj3dFromUuid' import { LocalTransformComponent, TransformComponent, TransformComponentType -} from '@xrengine/engine/src/transform/components/TransformComponent' +} from '@etherealengine/engine/src/transform/components/TransformComponent' import { computeLocalTransformMatrix, computeTransformMatrix -} from '@xrengine/engine/src/transform/systems/TransformSystem' -import { dispatchAction, getState, useState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/transform/systems/TransformSystem' +import { dispatchAction, getState, useState } from '@etherealengine/hyperflux' import { EditorHistoryAction } from '../services/EditorHistory' import { EditorAction } from '../services/EditorServices' diff --git a/packages/editor/src/functions/PrefabEditors.tsx b/packages/editor/src/functions/PrefabEditors.tsx index 72b8327d78..d40a817f4e 100644 --- a/packages/editor/src/functions/PrefabEditors.tsx +++ b/packages/editor/src/functions/PrefabEditors.tsx @@ -1,41 +1,41 @@ -import { PositionalAudioComponent } from '@xrengine/engine/src/audio/components/PositionalAudioComponent' -import { MediaPrefabs } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { Component } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { PhysicsPrefabs } from '@xrengine/engine/src/physics/systems/PhysicsSystem' -import { AmbientLightComponent } from '@xrengine/engine/src/scene/components/AmbientLightComponent' -import { CloudComponent } from '@xrengine/engine/src/scene/components/CloudComponent' -import { ColliderComponent } from '@xrengine/engine/src/scene/components/ColliderComponent' -import { DirectionalLightComponent } from '@xrengine/engine/src/scene/components/DirectionalLightComponent' -import { EnvMapBakeComponent } from '@xrengine/engine/src/scene/components/EnvMapBakeComponent' -import { EnvmapComponent } from '@xrengine/engine/src/scene/components/EnvmapComponent' -import { GroundPlaneComponent } from '@xrengine/engine/src/scene/components/GroundPlaneComponent' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { HemisphereLightComponent } from '@xrengine/engine/src/scene/components/HemisphereLightComponent' -import { ImageComponent } from '@xrengine/engine/src/scene/components/ImageComponent' -import { InstancingComponent } from '@xrengine/engine/src/scene/components/InstancingComponent' -import { InteriorComponent } from '@xrengine/engine/src/scene/components/InteriorComponent' -import { MediaComponent } from '@xrengine/engine/src/scene/components/MediaComponent' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { MountPointComponent } from '@xrengine/engine/src/scene/components/MountPointComponent' -import { OceanComponent } from '@xrengine/engine/src/scene/components/OceanComponent' -import { ParticleSystemComponent } from '@xrengine/engine/src/scene/components/ParticleSystemComponent' -import { PointLightComponent } from '@xrengine/engine/src/scene/components/PointLightComponent' -import { PortalComponent } from '@xrengine/engine/src/scene/components/PortalComponent' -import { PrefabComponent } from '@xrengine/engine/src/scene/components/PrefabComponent' -import { ScenePreviewCameraComponent } from '@xrengine/engine/src/scene/components/ScenePreviewCamera' -import { SceneTagComponent } from '@xrengine/engine/src/scene/components/SceneTagComponent' -import { SkyboxComponent } from '@xrengine/engine/src/scene/components/SkyboxComponent' -import { SpawnPointComponent } from '@xrengine/engine/src/scene/components/SpawnPointComponent' -import { SplineComponent } from '@xrengine/engine/src/scene/components/SplineComponent' -import { SpotLightComponent } from '@xrengine/engine/src/scene/components/SpotLightComponent' -import { SystemComponent } from '@xrengine/engine/src/scene/components/SystemComponent' -import { VideoComponent } from '@xrengine/engine/src/scene/components/VideoComponent' -import { VolumetricComponent } from '@xrengine/engine/src/scene/components/VolumetricComponent' -import { WaterComponent } from '@xrengine/engine/src/scene/components/WaterComponent' -import { LightPrefabs } from '@xrengine/engine/src/scene/systems/LightSystem' -import { ScenePrefabs } from '@xrengine/engine/src/scene/systems/SceneObjectUpdateSystem' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { PersistentAnchorComponent } from '@xrengine/engine/src/xr/XRAnchorComponents' +import { PositionalAudioComponent } from '@etherealengine/engine/src/audio/components/PositionalAudioComponent' +import { MediaPrefabs } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { Component } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { PhysicsPrefabs } from '@etherealengine/engine/src/physics/systems/PhysicsSystem' +import { AmbientLightComponent } from '@etherealengine/engine/src/scene/components/AmbientLightComponent' +import { CloudComponent } from '@etherealengine/engine/src/scene/components/CloudComponent' +import { ColliderComponent } from '@etherealengine/engine/src/scene/components/ColliderComponent' +import { DirectionalLightComponent } from '@etherealengine/engine/src/scene/components/DirectionalLightComponent' +import { EnvMapBakeComponent } from '@etherealengine/engine/src/scene/components/EnvMapBakeComponent' +import { EnvmapComponent } from '@etherealengine/engine/src/scene/components/EnvmapComponent' +import { GroundPlaneComponent } from '@etherealengine/engine/src/scene/components/GroundPlaneComponent' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { HemisphereLightComponent } from '@etherealengine/engine/src/scene/components/HemisphereLightComponent' +import { ImageComponent } from '@etherealengine/engine/src/scene/components/ImageComponent' +import { InstancingComponent } from '@etherealengine/engine/src/scene/components/InstancingComponent' +import { InteriorComponent } from '@etherealengine/engine/src/scene/components/InteriorComponent' +import { MediaComponent } from '@etherealengine/engine/src/scene/components/MediaComponent' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { MountPointComponent } from '@etherealengine/engine/src/scene/components/MountPointComponent' +import { OceanComponent } from '@etherealengine/engine/src/scene/components/OceanComponent' +import { ParticleSystemComponent } from '@etherealengine/engine/src/scene/components/ParticleSystemComponent' +import { PointLightComponent } from '@etherealengine/engine/src/scene/components/PointLightComponent' +import { PortalComponent } from '@etherealengine/engine/src/scene/components/PortalComponent' +import { PrefabComponent } from '@etherealengine/engine/src/scene/components/PrefabComponent' +import { ScenePreviewCameraComponent } from '@etherealengine/engine/src/scene/components/ScenePreviewCamera' +import { SceneTagComponent } from '@etherealengine/engine/src/scene/components/SceneTagComponent' +import { SkyboxComponent } from '@etherealengine/engine/src/scene/components/SkyboxComponent' +import { SpawnPointComponent } from '@etherealengine/engine/src/scene/components/SpawnPointComponent' +import { SplineComponent } from '@etherealengine/engine/src/scene/components/SplineComponent' +import { SpotLightComponent } from '@etherealengine/engine/src/scene/components/SpotLightComponent' +import { SystemComponent } from '@etherealengine/engine/src/scene/components/SystemComponent' +import { VideoComponent } from '@etherealengine/engine/src/scene/components/VideoComponent' +import { VolumetricComponent } from '@etherealengine/engine/src/scene/components/VolumetricComponent' +import { WaterComponent } from '@etherealengine/engine/src/scene/components/WaterComponent' +import { LightPrefabs } from '@etherealengine/engine/src/scene/systems/LightSystem' +import { ScenePrefabs } from '@etherealengine/engine/src/scene/systems/SceneObjectUpdateSystem' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { PersistentAnchorComponent } from '@etherealengine/engine/src/xr/XRAnchorComponents' import ChairIcon from '@mui/icons-material/Chair' diff --git a/packages/editor/src/functions/addMediaNode.ts b/packages/editor/src/functions/addMediaNode.ts index fd05c37456..813a2578c3 100644 --- a/packages/editor/src/functions/addMediaNode.ts +++ b/packages/editor/src/functions/addMediaNode.ts @@ -1,15 +1,15 @@ -import { getContentType } from '@xrengine/common/src/utils/getContentType' -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { MediaPrefabs } from '@xrengine/engine/src/audio/systems/MediaSystem' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { EntityOrObjectUUID, EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { ImageComponent } from '@xrengine/engine/src/scene/components/ImageComponent' -import { MediaComponent } from '@xrengine/engine/src/scene/components/MediaComponent' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { PrefabComponent } from '@xrengine/engine/src/scene/components/PrefabComponent' -import { ScenePrefabs } from '@xrengine/engine/src/scene/systems/SceneObjectUpdateSystem' +import { getContentType } from '@etherealengine/common/src/utils/getContentType' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { MediaPrefabs } from '@etherealengine/engine/src/audio/systems/MediaSystem' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { EntityOrObjectUUID, EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { ImageComponent } from '@etherealengine/engine/src/scene/components/ImageComponent' +import { MediaComponent } from '@etherealengine/engine/src/scene/components/MediaComponent' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { PrefabComponent } from '@etherealengine/engine/src/scene/components/PrefabComponent' +import { ScenePrefabs } from '@etherealengine/engine/src/scene/systems/SceneObjectUpdateSystem' import { updateProperties } from '../components/properties/Util' import { EditorControlFunctions } from './EditorControlFunctions' diff --git a/packages/editor/src/functions/assetFunctions.ts b/packages/editor/src/functions/assetFunctions.ts index ba28bef0d9..d1b8ef7ae7 100644 --- a/packages/editor/src/functions/assetFunctions.ts +++ b/packages/editor/src/functions/assetFunctions.ts @@ -1,25 +1,25 @@ import { Object3D } from 'three' -import { API } from '@xrengine/client-core/src/API' -import { FileBrowserService } from '@xrengine/client-core/src/common/services/FileBrowserService' +import { API } from '@etherealengine/client-core/src/API' +import { FileBrowserService } from '@etherealengine/client-core/src/common/services/FileBrowserService' import { CancelableUploadPromiseArrayReturnType, CancelableUploadPromiseReturnType, uploadToFeathersService -} from '@xrengine/client-core/src/util/upload' -import { processFileName } from '@xrengine/common/src/utils/processFileName' -import { modelResourcesPath } from '@xrengine/engine/src/assets/functions/pathResolver' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID, EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' +} from '@etherealengine/client-core/src/util/upload' +import { processFileName } from '@etherealengine/common/src/utils/processFileName' +import { modelResourcesPath } from '@etherealengine/engine/src/assets/functions/pathResolver' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent, hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID, EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' import { addObjectToGroup, GroupComponent, Object3DWithEntity, removeObjectFromGroup -} from '@xrengine/engine/src/scene/components/GroupComponent' -import { PrefabComponent } from '@xrengine/engine/src/scene/components/PrefabComponent' -import { sceneToGLTF } from '@xrengine/engine/src/scene/functions/GLTFConversion' +} from '@etherealengine/engine/src/scene/components/GroupComponent' +import { PrefabComponent } from '@etherealengine/engine/src/scene/components/PrefabComponent' +import { sceneToGLTF } from '@etherealengine/engine/src/scene/functions/GLTFConversion' import { accessEditorState } from '../services/EditorServices' diff --git a/packages/editor/src/functions/cancelGrabOrPlacement.ts b/packages/editor/src/functions/cancelGrabOrPlacement.ts index 3b0f60743b..e520f73f6c 100644 --- a/packages/editor/src/functions/cancelGrabOrPlacement.ts +++ b/packages/editor/src/functions/cancelGrabOrPlacement.ts @@ -1,6 +1,6 @@ -import { getEntityNodeArrayFromEntities } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { TransformMode } from '@xrengine/engine/src/scene/constants/transformConstants' -import { getState } from '@xrengine/hyperflux' +import { getEntityNodeArrayFromEntities } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { TransformMode } from '@etherealengine/engine/src/scene/constants/transformConstants' +import { getState } from '@etherealengine/hyperflux' import { accessEditorHelperState } from '../services/EditorHelperState' import { SelectionState } from '../services/SelectionServices' diff --git a/packages/editor/src/functions/copyPaste.ts b/packages/editor/src/functions/copyPaste.ts index 21d051da6f..e3c1eb9f26 100644 --- a/packages/editor/src/functions/copyPaste.ts +++ b/packages/editor/src/functions/copyPaste.ts @@ -1,6 +1,6 @@ -import { hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { dispatchAction } from '@xrengine/hyperflux' +import { hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { dispatchAction } from '@etherealengine/hyperflux' import { EditorErrorAction } from '../services/EditorErrorServices' import { accessSelectionState } from '../services/SelectionServices' diff --git a/packages/editor/src/functions/exportGLTF.ts b/packages/editor/src/functions/exportGLTF.ts index d20fd34244..934d593fda 100644 --- a/packages/editor/src/functions/exportGLTF.ts +++ b/packages/editor/src/functions/exportGLTF.ts @@ -1,6 +1,6 @@ -import exportModelGLTF from '@xrengine/engine/src/assets/functions/exportModelGLTF' -import { pathResolver } from '@xrengine/engine/src/assets/functions/pathResolver' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import exportModelGLTF from '@etherealengine/engine/src/assets/functions/exportModelGLTF' +import { pathResolver } from '@etherealengine/engine/src/assets/functions/pathResolver' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import { accessEditorState } from '../services/EditorServices' import { uploadProjectFiles } from './assetFunctions' diff --git a/packages/editor/src/functions/filterParentEntities.ts b/packages/editor/src/functions/filterParentEntities.ts index ea9092d273..924ee58404 100644 --- a/packages/editor/src/functions/filterParentEntities.ts +++ b/packages/editor/src/functions/filterParentEntities.ts @@ -1,8 +1,8 @@ -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent, hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' /** * Filters the parent entities from the given entity list. diff --git a/packages/editor/src/functions/getDetachedObjectsRoots.ts b/packages/editor/src/functions/getDetachedObjectsRoots.ts index 8f04d66b4a..88f0217e50 100755 --- a/packages/editor/src/functions/getDetachedObjectsRoots.ts +++ b/packages/editor/src/functions/getDetachedObjectsRoots.ts @@ -1,14 +1,18 @@ import { Object3D } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getComponent, getOptionalComponent, hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { + getComponent, + getOptionalComponent, + hasComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import { EntityOrObjectUUID, EntityTreeComponent, findIndexOfEntityNode -} from '@xrengine/engine/src/ecs/functions/EntityTree' -import { Object3DWithEntity } from '@xrengine/engine/src/scene/components/GroupComponent' -import obj3dFromUuid from '@xrengine/engine/src/scene/util/obj3dFromUuid' +} from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { Object3DWithEntity } from '@etherealengine/engine/src/scene/components/GroupComponent' +import obj3dFromUuid from '@etherealengine/engine/src/scene/util/obj3dFromUuid' import traverseEarlyOut from './traverseEarlyOut' diff --git a/packages/editor/src/functions/getIntersectingNode.ts b/packages/editor/src/functions/getIntersectingNode.ts index 0c94890b4c..efd0757e9d 100755 --- a/packages/editor/src/functions/getIntersectingNode.ts +++ b/packages/editor/src/functions/getIntersectingNode.ts @@ -1,11 +1,11 @@ import { Camera, Intersection, Object3D, Raycaster, Vector2 } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID, getEntityNodeArrayFromEntities } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { GroupComponent, Object3DWithEntity } from '@xrengine/engine/src/scene/components/GroupComponent' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID, getEntityNodeArrayFromEntities } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { GroupComponent, Object3DWithEntity } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' import { accessSelectionState } from '../services/SelectionServices' diff --git a/packages/editor/src/functions/getSpaceMatrix.ts b/packages/editor/src/functions/getSpaceMatrix.ts index 08e2dc6493..58789db2bb 100644 --- a/packages/editor/src/functions/getSpaceMatrix.ts +++ b/packages/editor/src/functions/getSpaceMatrix.ts @@ -1,9 +1,9 @@ import { Matrix4 } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' import { accessSelectionState } from '../services/SelectionServices' diff --git a/packages/editor/src/functions/projectFunctions.tsx b/packages/editor/src/functions/projectFunctions.tsx index d8279eeaa3..22930b6c0d 100644 --- a/packages/editor/src/functions/projectFunctions.tsx +++ b/packages/editor/src/functions/projectFunctions.tsx @@ -1,8 +1,8 @@ -import { API } from '@xrengine/client-core/src/API' -import { MultiError } from '@xrengine/client-core/src/util/errors' -import { ProjectInterface } from '@xrengine/common/src/interfaces/ProjectInterface' -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' -import { dispatchAction } from '@xrengine/hyperflux' +import { API } from '@etherealengine/client-core/src/API' +import { MultiError } from '@etherealengine/client-core/src/util/errors' +import { ProjectInterface } from '@etherealengine/common/src/interfaces/ProjectInterface' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' +import { dispatchAction } from '@etherealengine/hyperflux' import { copy, paste } from '../functions/copyPaste' import { EditorErrorAction } from '../services/EditorErrorServices' diff --git a/packages/editor/src/functions/sceneFunctions.tsx b/packages/editor/src/functions/sceneFunctions.tsx index 578cf6c5fa..8e976b1a3f 100644 --- a/packages/editor/src/functions/sceneFunctions.tsx +++ b/packages/editor/src/functions/sceneFunctions.tsx @@ -1,10 +1,10 @@ import i18n from 'i18next' -import { API } from '@xrengine/client-core/src/API' -import { uploadToFeathersService } from '@xrengine/client-core/src/util/upload' -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' -import multiLogger from '@xrengine/common/src/logger' -import { serializeWorld } from '@xrengine/engine/src/scene/functions/serializeWorld' +import { API } from '@etherealengine/client-core/src/API' +import { uploadToFeathersService } from '@etherealengine/client-core/src/util/upload' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' +import multiLogger from '@etherealengine/common/src/logger' +import { serializeWorld } from '@etherealengine/engine/src/scene/functions/serializeWorld' const logger = multiLogger.child({ component: 'editor:sceneFunctions' }) diff --git a/packages/editor/src/functions/sceneRenderFunctions.ts b/packages/editor/src/functions/sceneRenderFunctions.ts index 74dce82daa..b0284d189a 100644 --- a/packages/editor/src/functions/sceneRenderFunctions.ts +++ b/packages/editor/src/functions/sceneRenderFunctions.ts @@ -1,16 +1,20 @@ import { Group, Object3D, Scene, Vector3, WebGLInfo } from 'three' -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { addComponent, getComponent, removeComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { matchActionOnce } from '@xrengine/engine/src/networking/functions/matchActionOnce' -import InfiniteGridHelper from '@xrengine/engine/src/scene/classes/InfiniteGridHelper' -import TransformGizmo from '@xrengine/engine/src/scene/classes/TransformGizmo' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' -import { updateSceneFromJSON } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { dispatchAction } from '@xrengine/hyperflux' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { + addComponent, + getComponent, + removeComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { matchActionOnce } from '@etherealengine/engine/src/networking/functions/matchActionOnce' +import InfiniteGridHelper from '@etherealengine/engine/src/scene/classes/InfiniteGridHelper' +import TransformGizmo from '@etherealengine/engine/src/scene/classes/TransformGizmo' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' +import { updateSceneFromJSON } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { dispatchAction } from '@etherealengine/hyperflux' import { EditorCameraComponent } from '../classes/EditorCameraComponent' import { EditorHistoryAction } from '../services/EditorHistory' diff --git a/packages/editor/src/functions/screenSpaceFunctions.ts b/packages/editor/src/functions/screenSpaceFunctions.ts index b221e0b6dc..13f90a0b2f 100644 --- a/packages/editor/src/functions/screenSpaceFunctions.ts +++ b/packages/editor/src/functions/screenSpaceFunctions.ts @@ -1,8 +1,8 @@ import { Intersection, Object3D, Raycaster, Vector2, Vector3 } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineRenderer } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { SnapMode } from '@xrengine/engine/src/scene/constants/transformConstants' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineRenderer } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { SnapMode } from '@etherealengine/engine/src/scene/constants/transformConstants' import { accessEditorHelperState } from '../services/EditorHelperState' import { EditorControlFunctions } from './EditorControlFunctions' diff --git a/packages/editor/src/functions/takeScreenshot.ts b/packages/editor/src/functions/takeScreenshot.ts index 6c9f213971..40d9bc3853 100644 --- a/packages/editor/src/functions/takeScreenshot.ts +++ b/packages/editor/src/functions/takeScreenshot.ts @@ -1,15 +1,21 @@ import { PerspectiveCamera } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { addComponent, defineQuery, getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { addEntityNodeChild } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { configureEffectComposer } from '@xrengine/engine/src/renderer/functions/configureEffectComposer' -import { EngineRenderer, getPostProcessingSceneMetadataState } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { addObjectToGroup } from '@xrengine/engine/src/scene/components/GroupComponent' -import { ScenePreviewCameraComponent } from '@xrengine/engine/src/scene/components/ScenePreviewCamera' -import { ObjectLayers } from '@xrengine/engine/src/scene/constants/ObjectLayers' -import { setTransformComponent, TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { addComponent, defineQuery, getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { addEntityNodeChild } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { configureEffectComposer } from '@etherealengine/engine/src/renderer/functions/configureEffectComposer' +import { + EngineRenderer, + getPostProcessingSceneMetadataState +} from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { addObjectToGroup } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { ScenePreviewCameraComponent } from '@etherealengine/engine/src/scene/components/ScenePreviewCamera' +import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers' +import { + setTransformComponent, + TransformComponent +} from '@etherealengine/engine/src/transform/components/TransformComponent' import { getCanvasBlob } from './thumbnails' diff --git a/packages/editor/src/functions/transformFunctions.ts b/packages/editor/src/functions/transformFunctions.ts index d05e9b16c4..a2ad82391b 100644 --- a/packages/editor/src/functions/transformFunctions.ts +++ b/packages/editor/src/functions/transformFunctions.ts @@ -1,7 +1,7 @@ -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { hasComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { traverseEntityNode } from '@xrengine/engine/src/ecs/functions/EntityTree' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { hasComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { traverseEntityNode } from '@etherealengine/engine/src/ecs/functions/EntityTree' import { SnapMode, TransformMode, @@ -9,9 +9,9 @@ import { TransformPivot, TransformPivotType, TransformSpace -} from '@xrengine/engine/src/scene/constants/transformConstants' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { dispatchAction } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/scene/constants/transformConstants' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { dispatchAction } from '@etherealengine/hyperflux' import { accessEditorHelperState, EditorHelperAction } from '../services/EditorHelperState' import { accessSelectionState } from '../services/SelectionServices' diff --git a/packages/editor/src/functions/traverseEarlyOut.ts b/packages/editor/src/functions/traverseEarlyOut.ts index e948d64ce2..017171cc13 100755 --- a/packages/editor/src/functions/traverseEarlyOut.ts +++ b/packages/editor/src/functions/traverseEarlyOut.ts @@ -1,6 +1,6 @@ -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID, EntityTreeComponent } from '@xrengine/engine/src/ecs/functions/EntityTree' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID, EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree' export default function traverseEarlyOut(node: EntityOrObjectUUID, cb: (node: EntityOrObjectUUID) => boolean): boolean { let stopTravel = cb(node) diff --git a/packages/editor/src/functions/updateOutlinePassSelection.ts b/packages/editor/src/functions/updateOutlinePassSelection.ts index ec3acfef14..6a098669d4 100644 --- a/packages/editor/src/functions/updateOutlinePassSelection.ts +++ b/packages/editor/src/functions/updateOutlinePassSelection.ts @@ -1,10 +1,10 @@ -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getComponent, getOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EngineRenderer } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { Effects } from '@xrengine/engine/src/scene/constants/PostProcessing' -import obj3dFromUuid from '@xrengine/engine/src/scene/util/obj3dFromUuid' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getComponent, getOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EngineRenderer } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { Effects } from '@etherealengine/engine/src/scene/constants/PostProcessing' +import obj3dFromUuid from '@etherealengine/engine/src/scene/util/obj3dFromUuid' import { accessSelectionState } from '../services/SelectionServices' diff --git a/packages/editor/src/functions/uploadEnvMapBake.ts b/packages/editor/src/functions/uploadEnvMapBake.ts index c06dcdd05c..4d4ba99fb4 100644 --- a/packages/editor/src/functions/uploadEnvMapBake.ts +++ b/packages/editor/src/functions/uploadEnvMapBake.ts @@ -1,24 +1,24 @@ import { Mesh, MeshBasicMaterial, Scene, Vector3 } from 'three' -import { addOBCPlugin, removeOBCPlugin } from '@xrengine/engine/src/common/functions/OnBeforeCompilePlugin' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { addOBCPlugin, removeOBCPlugin } from '@etherealengine/engine/src/common/functions/OnBeforeCompilePlugin' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { addComponent, defineQuery, getComponent, hasComponent, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EngineRenderer } from '@xrengine/engine/src/renderer/WebGLRendererSystem' -import { beforeMaterialCompile } from '@xrengine/engine/src/scene/classes/BPCEMShader' -import CubemapCapturer from '@xrengine/engine/src/scene/classes/CubemapCapturer' -import { convertCubemapToEquiImageData } from '@xrengine/engine/src/scene/classes/ImageUtils' -import { EnvMapBakeComponent } from '@xrengine/engine/src/scene/components/EnvMapBakeComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { ScenePreviewCameraComponent } from '@xrengine/engine/src/scene/components/ScenePreviewCamera' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EngineRenderer } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' +import { beforeMaterialCompile } from '@etherealengine/engine/src/scene/classes/BPCEMShader' +import CubemapCapturer from '@etherealengine/engine/src/scene/classes/CubemapCapturer' +import { convertCubemapToEquiImageData } from '@etherealengine/engine/src/scene/classes/ImageUtils' +import { EnvMapBakeComponent } from '@etherealengine/engine/src/scene/components/EnvMapBakeComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { ScenePreviewCameraComponent } from '@etherealengine/engine/src/scene/components/ScenePreviewCamera' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' import { accessEditorState } from '../services/EditorServices' import { uploadProjectFiles } from './assetFunctions' diff --git a/packages/editor/src/lightmapper/lightmap.ts b/packages/editor/src/lightmapper/lightmap.ts index c3b1cbbb0e..0b11a78ecd 100644 --- a/packages/editor/src/lightmapper/lightmap.ts +++ b/packages/editor/src/lightmapper/lightmap.ts @@ -1,7 +1,7 @@ import { Mesh, MeshStandardMaterial, Object3D, Scene, WebGLRenderer } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import iterateObject3D from '@xrengine/engine/src/scene/util/iterateObject3D' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import iterateObject3D from '@etherealengine/engine/src/scene/util/iterateObject3D' import { isAncestor } from '../functions/getDetachedObjectsRoots' import { runBakingPasses } from './bake' diff --git a/packages/editor/src/pages/EditorPage.tsx b/packages/editor/src/pages/EditorPage.tsx index 891b3d69be..a3450fdc55 100644 --- a/packages/editor/src/pages/EditorPage.tsx +++ b/packages/editor/src/pages/EditorPage.tsx @@ -1,18 +1,18 @@ import React, { useEffect, useState } from 'react' import { useParams } from 'react-router-dom' -import { API } from '@xrengine/client-core/src/API' -import { useProjectState } from '@xrengine/client-core/src/common/services/ProjectService' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import PortalLoadSystem from '@xrengine/client-core/src/systems/PortalLoadSystem' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { ClientModules } from '@xrengine/client-core/src/world/ClientModules' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { initSystems } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { SystemUpdateType } from '@xrengine/engine/src/ecs/functions/SystemUpdateType' -import { dispatchAction } from '@xrengine/hyperflux' -import { loadEngineInjection } from '@xrengine/projects/loadEngineInjection' +import { API } from '@etherealengine/client-core/src/API' +import { useProjectState } from '@etherealengine/client-core/src/common/services/ProjectService' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import PortalLoadSystem from '@etherealengine/client-core/src/systems/PortalLoadSystem' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { ClientModules } from '@etherealengine/client-core/src/world/ClientModules' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { initSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { SystemUpdateType } from '@etherealengine/engine/src/ecs/functions/SystemUpdateType' +import { dispatchAction } from '@etherealengine/hyperflux' +import { loadEngineInjection } from '@etherealengine/projects/loadEngineInjection' import EditorContainer from '../components/EditorContainer' import { EditorAction, useEditorState } from '../services/EditorServices' diff --git a/packages/editor/src/pages/SignInPage.tsx b/packages/editor/src/pages/SignInPage.tsx index 6076bd71b4..f04d0ad774 100644 --- a/packages/editor/src/pages/SignInPage.tsx +++ b/packages/editor/src/pages/SignInPage.tsx @@ -2,8 +2,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import SignIn from '@xrengine/client-core/src/user/components/Auth/Login' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' +import SignIn from '@etherealengine/client-core/src/user/components/Auth/Login' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' /** * Creating styled component using section. diff --git a/packages/editor/src/pages/editor.tsx b/packages/editor/src/pages/editor.tsx index 6d289c83a6..eca6572955 100755 --- a/packages/editor/src/pages/editor.tsx +++ b/packages/editor/src/pages/editor.tsx @@ -2,10 +2,10 @@ import { t } from 'i18next' import React, { Suspense, useEffect, useState } from 'react' import { Route, Routes } from 'react-router-dom' -import { useRouter } from '@xrengine/client-core/src/common/services/RouterService' -import { LoadingCircle } from '@xrengine/client-core/src/components/LoadingCircle' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import { userHasAccess } from '@xrengine/client-core/src/user/userHasAccess' +import { useRouter } from '@etherealengine/client-core/src/common/services/RouterService' +import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import { userHasAccess } from '@etherealengine/client-core/src/user/userHasAccess' import { EditorPage } from './EditorPage' import { ProjectPage } from './ProjectPage' diff --git a/packages/editor/src/services/EditorErrorServices.ts b/packages/editor/src/services/EditorErrorServices.ts index 7d5fa8f76c..a7a3225674 100644 --- a/packages/editor/src/services/EditorErrorServices.ts +++ b/packages/editor/src/services/EditorErrorServices.ts @@ -1,7 +1,7 @@ import { useState } from '@hookstate/core' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState } from '@etherealengine/hyperflux' type EditorErrorServiceStateType = { error: any diff --git a/packages/editor/src/services/EditorHelperState.ts b/packages/editor/src/services/EditorHelperState.ts index 8ad859a8a9..54c74063bb 100644 --- a/packages/editor/src/services/EditorHelperState.ts +++ b/packages/editor/src/services/EditorHelperState.ts @@ -1,11 +1,15 @@ import { useHookstate } from '@hookstate/core' import React, { useEffect } from 'react' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { hasComponent, useComponent, useOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import InfiniteGridHelper from '@xrengine/engine/src/scene/classes/InfiniteGridHelper' -import { TransformGizmoComponent } from '@xrengine/engine/src/scene/components/TransformGizmo' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { + hasComponent, + useComponent, + useOptionalComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import InfiniteGridHelper from '@etherealengine/engine/src/scene/classes/InfiniteGridHelper' +import { TransformGizmoComponent } from '@etherealengine/engine/src/scene/components/TransformGizmo' import { SnapMode, SnapModeType, @@ -14,8 +18,8 @@ import { TransformPivot, TransformPivotType, TransformSpace -} from '@xrengine/engine/src/scene/constants/transformConstants' -import { defineAction, defineState, getState, startReactor, syncStateWithLocalStorage } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/scene/constants/transformConstants' +import { defineAction, defineState, getState, startReactor, syncStateWithLocalStorage } from '@etherealengine/hyperflux' import { createTransformGizmo } from '../systems/EditorControlSystem' diff --git a/packages/editor/src/services/EditorHistory.ts b/packages/editor/src/services/EditorHistory.ts index 3ed0725b4a..3ed5826f34 100644 --- a/packages/editor/src/services/EditorHistory.ts +++ b/packages/editor/src/services/EditorHistory.ts @@ -1,19 +1,19 @@ -import { SceneData, SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions } from '@xrengine/engine/src/ecs/classes/EngineState' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { SystemDefintion } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { serializeWorld } from '@xrengine/engine/src/scene/functions/serializeWorld' -import { updateSceneFromJSON } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -import { defineAction, defineState, getState, NO_PROXY } from '@xrengine/hyperflux' +import { SceneData, SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { SystemDefintion } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { serializeWorld } from '@etherealengine/engine/src/scene/functions/serializeWorld' +import { updateSceneFromJSON } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +import { defineAction, defineState, getState, NO_PROXY } from '@etherealengine/hyperflux' import { createActionQueue, dispatchAction, removeActionQueue, Topic -} from '@xrengine/hyperflux/functions/ActionFunctions' +} from '@etherealengine/hyperflux/functions/ActionFunctions' import { SelectionAction, SelectionState } from './SelectionServices' diff --git a/packages/editor/src/services/EditorServices.ts b/packages/editor/src/services/EditorServices.ts index 4784757f0b..34ad2cd6c1 100644 --- a/packages/editor/src/services/EditorServices.ts +++ b/packages/editor/src/services/EditorServices.ts @@ -1,8 +1,8 @@ import { useState } from '@hookstate/core' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState } from '@xrengine/hyperflux' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState } from '@etherealengine/hyperflux' export const EditorState = defineState({ name: 'EditorState', diff --git a/packages/editor/src/services/EditorServicesReceptor.ts b/packages/editor/src/services/EditorServicesReceptor.ts index 50dc86c5a9..02c990d4a1 100644 --- a/packages/editor/src/services/EditorServicesReceptor.ts +++ b/packages/editor/src/services/EditorServicesReceptor.ts @@ -1,4 +1,4 @@ -import { addActionReceptor, removeActionReceptor } from '@xrengine/hyperflux' +import { addActionReceptor, removeActionReceptor } from '@etherealengine/hyperflux' import { EditorErrorServiceReceptor } from './EditorErrorServices' import { EditorHelperServiceReceptor } from './EditorHelperState' diff --git a/packages/editor/src/services/SelectionServices.ts b/packages/editor/src/services/SelectionServices.ts index 952e411954..9b324d6b31 100644 --- a/packages/editor/src/services/SelectionServices.ts +++ b/packages/editor/src/services/SelectionServices.ts @@ -1,12 +1,16 @@ import { useState } from '@hookstate/core' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { hasComponent, removeComponent, setComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { EntityOrObjectUUID } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { SystemDefintion } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { SelectTagComponent } from '@xrengine/engine/src/scene/components/SelectTagComponent' -import { createActionQueue, defineAction, defineState, getState, removeActionQueue } from '@xrengine/hyperflux' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { + hasComponent, + removeComponent, + setComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { EntityOrObjectUUID } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { SystemDefintion } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { SelectTagComponent } from '@etherealengine/engine/src/scene/components/SelectTagComponent' +import { createActionQueue, defineAction, defineState, getState, removeActionQueue } from '@etherealengine/hyperflux' import { cancelGrabOrPlacement } from '../functions/cancelGrabOrPlacement' import { filterParentEntities } from '../functions/filterParentEntities' diff --git a/packages/editor/src/systems/EditorCameraSystem.ts b/packages/editor/src/systems/EditorCameraSystem.ts index 50d02775f5..6002446038 100644 --- a/packages/editor/src/systems/EditorCameraSystem.ts +++ b/packages/editor/src/systems/EditorCameraSystem.ts @@ -1,20 +1,20 @@ import { Box3, Matrix3, Sphere, Spherical, Vector3 } from 'three' -import { CameraComponent } from '@xrengine/engine/src/camera/components/CameraComponent' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { CameraComponent } from '@etherealengine/engine/src/camera/components/CameraComponent' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { defineQuery, getComponent, getOptionalComponent, hasComponent, removeQuery -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import obj3dFromUuid from '@xrengine/engine/src/scene/util/obj3dFromUuid' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import obj3dFromUuid from '@etherealengine/engine/src/scene/util/obj3dFromUuid' import { LocalTransformComponent, TransformComponent -} from '@xrengine/engine/src/transform/components/TransformComponent' +} from '@etherealengine/engine/src/transform/components/TransformComponent' import { EditorCameraComponent } from '../classes/EditorCameraComponent' diff --git a/packages/editor/src/systems/EditorControlSystem.ts b/packages/editor/src/systems/EditorControlSystem.ts index 0e10d90c86..f20ab9d435 100644 --- a/packages/editor/src/systems/EditorControlSystem.ts +++ b/packages/editor/src/systems/EditorControlSystem.ts @@ -13,11 +13,11 @@ import { Vector3 } from 'three' -import { V_010 } from '@xrengine/engine/src/common/constants/MathConstants' -import { throttle } from '@xrengine/engine/src/common/functions/FunctionHelpers' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { V_010 } from '@etherealengine/engine/src/common/constants/MathConstants' +import { throttle } from '@etherealengine/engine/src/common/functions/FunctionHelpers' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { addComponent, defineQuery, @@ -27,15 +27,15 @@ import { removeComponent, removeQuery, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { getEntityNodeArrayFromEntities } from '@xrengine/engine/src/ecs/functions/EntityTree' -import InfiniteGridHelper from '@xrengine/engine/src/scene/classes/InfiniteGridHelper' -import TransformGizmo from '@xrengine/engine/src/scene/classes/TransformGizmo' -import { addObjectToGroup, GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { TransformGizmoComponent } from '@xrengine/engine/src/scene/components/TransformGizmo' -import { VisibleComponent } from '@xrengine/engine/src/scene/components/VisibleComponent' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { getEntityNodeArrayFromEntities } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import InfiniteGridHelper from '@etherealengine/engine/src/scene/classes/InfiniteGridHelper' +import TransformGizmo from '@etherealengine/engine/src/scene/classes/TransformGizmo' +import { addObjectToGroup, GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { TransformGizmoComponent } from '@etherealengine/engine/src/scene/components/TransformGizmo' +import { VisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent' import { SnapMode, TransformAxis, @@ -44,10 +44,13 @@ import { TransformModeType, TransformPivot, TransformPivotType -} from '@xrengine/engine/src/scene/constants/transformConstants' -import { TransformSpace } from '@xrengine/engine/src/scene/constants/transformConstants' -import { setTransformComponent, TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { createActionQueue, dispatchAction, getState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/scene/constants/transformConstants' +import { TransformSpace } from '@etherealengine/engine/src/scene/constants/transformConstants' +import { + setTransformComponent, + TransformComponent +} from '@etherealengine/engine/src/transform/components/TransformComponent' +import { createActionQueue, dispatchAction, getState } from '@etherealengine/hyperflux' import { EditorCameraComponent, EditorCameraComponentType } from '../classes/EditorCameraComponent' import { cancelGrabOrPlacement } from '../functions/cancelGrabOrPlacement' diff --git a/packages/editor/src/systems/EditorFlyControlSystem.ts b/packages/editor/src/systems/EditorFlyControlSystem.ts index 99d4afce09..584f0d1c0b 100644 --- a/packages/editor/src/systems/EditorFlyControlSystem.ts +++ b/packages/editor/src/systems/EditorFlyControlSystem.ts @@ -1,15 +1,15 @@ import { MathUtils, Matrix3, Vector3 } from 'three' -import { FlyControlComponent } from '@xrengine/engine/src/avatar/components/FlyControlComponent' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { FlyControlComponent } from '@etherealengine/engine/src/avatar/components/FlyControlComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { getComponent, hasComponent, removeComponent, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { dispatchAction } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { dispatchAction } from '@etherealengine/hyperflux' import { EditorCameraComponent } from '../classes/EditorCameraComponent' import { EditorHelperAction } from '../services/EditorHelperState' diff --git a/packages/editor/src/systems/GizmoSystem.ts b/packages/editor/src/systems/GizmoSystem.ts index a2324f5b94..9835c362e6 100644 --- a/packages/editor/src/systems/GizmoSystem.ts +++ b/packages/editor/src/systems/GizmoSystem.ts @@ -1,8 +1,8 @@ -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { defineQuery, getComponent, removeQuery } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { TransformGizmoComponent } from '@xrengine/engine/src/scene/components/TransformGizmo' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { defineQuery, getComponent, removeQuery } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { TransformGizmoComponent } from '@etherealengine/engine/src/scene/components/TransformGizmo' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' const GIZMO_SIZE = 10 diff --git a/packages/editor/src/systems/ModelHandlingSystem.ts b/packages/editor/src/systems/ModelHandlingSystem.ts index 174709c8e4..64a18d3cf1 100644 --- a/packages/editor/src/systems/ModelHandlingSystem.ts +++ b/packages/editor/src/systems/ModelHandlingSystem.ts @@ -1,6 +1,6 @@ -import BufferHandlerExtension from '@xrengine/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import BufferHandlerExtension from '@etherealengine/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { clearModelResources, uploadProjectFiles } from '../functions/assetFunctions' import { accessEditorState } from '../services/EditorServices' diff --git a/packages/editor/src/systems/RenderSystem.ts b/packages/editor/src/systems/RenderSystem.ts index 72dbd8bce2..5d1d479b09 100644 --- a/packages/editor/src/systems/RenderSystem.ts +++ b/packages/editor/src/systems/RenderSystem.ts @@ -1,5 +1,5 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { EngineRenderer } from '@xrengine/engine/src/renderer/WebGLRendererSystem' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { EngineRenderer } from '@etherealengine/engine/src/renderer/WebGLRendererSystem' import { SceneState } from '../functions/sceneRenderFunctions' diff --git a/packages/editor/tests/setup.js b/packages/editor/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/editor/tests/setup.js +++ b/packages/editor/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/engine/.ctirc b/packages/engine/.ctirc deleted file mode 100644 index d78b605933..0000000000 --- a/packages/engine/.ctirc +++ /dev/null @@ -1,36 +0,0 @@ -{ - addNewline: true, - excludes: [ - '@types', - 'typings', - '__test__', - '__tests__', - 'node_modules', - ], - fileExcludePatterns: [], - fileFirst: true, - globOptions: { - cwd: 'D:\\Projects\\xr3ngine\\packages\\engine', - dot: true, - ignore: [ - '@types/**', - 'typings/**', - '__test__/**', - '__tests__/**', - 'node_modules/**', - ], - nonull: true, - }, - includeCWD: true, - output: 'index.ts', - quote: "'", - targetExts: [ - 'ts', - 'tsx', - ], - useSemicolon: false, - useTimestamp: false, - verbose: false, - withoutBackupFile: true, - withoutComment: true, -} diff --git a/packages/engine/ECS-Guide.md b/packages/engine/ECS-Guide.md index f9d22ad75c..2a5d7fe279 100755 --- a/packages/engine/ECS-Guide.md +++ b/packages/engine/ECS-Guide.md @@ -3,14 +3,14 @@ ECS stands for Entity Component System. It is a pattern for organising data and objects that allows for composition over inheritance. An entity is simply a number that points to a particular set of data contained in components. Systems then operate logic on these entities and components. ```ts -import { createEntity } from "@xrengine/engine/src/ecs/functions/EntityFunctions" -import { World } from "@xrengine/engine/src/ecs/classes/World" +import { createEntity } from "@etherealengine/engine/src/ecs/functions/EntityFunctions" +import { World } from "@etherealengine/engine/src/ecs/classes/World" import { addComponent, createMappedComponent, defineQuery, getComponent -} from "@xrengine/engine/src/ecs/functions/ComponentFunctions" +} from "@etherealengine/engine/src/ecs/functions/ComponentFunctions" export const TimerComponent = createMappedComponent<{ time: number }>('TimerComponent') diff --git a/packages/engine/LICENSE b/packages/engine/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/engine/LICENSE +++ b/packages/engine/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/engine/package.json b/packages/engine/package.json index 1450394937..3e966de260 100644 --- a/packages/engine/package.json +++ b/packages/engine/package.json @@ -1,43 +1,42 @@ { - "name": "@xrengine/engine", + "name": "@etherealengine/engine", "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io", - "url": "http://github.com/XRFoundation" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.org", + "url": "http://github.com/etherealengine" }, "bugs": { - "url": "https://github.com/XRFoundation/XREngine/issues" + "url": "https://github.com/etherealengine/etherealengine/issues" }, "publishConfig": { "access": "public" }, "description": "A declarative way to build 3D/VR/AR/XR apps that scale. Built with tooling web developers will love, using conventions that game developers and creative coders will find straightforward familiar.", - "homepage": "https://github.com/XRFoundation/XREngine#readme", + "homepage": "https://github.com/etherealengine/etherealengine#readme", "license": "MIT", "main": "lib/engine.umd.js", "module": "lib/engine.es.js", "types": "lib/index.d.ts", "repository": { "type": "git", - "url": "git+https://github.com/XRFoundation/XREngine.git" + "url": "git+https://github.com/etherealengine/etherealengine.git" }, "scripts": { "check-errors": "tsc --noemit", "test": "mocha --config .mocharc.js", "validate": "npm run test", - "generate-doc": "node_modules/.bin/typedoc", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "generate-doc": "node_modules/.bin/typedoc" }, "version": "1.1.3", "dependencies": { "@dimforge/rapier3d-compat": "0.11.1", + "@etherealengine/common": "^1.1.3", + "@etherealengine/hyperflux": "^1.1.3", + "@etherealengine/volumetric": "1.0.11", + "@etherealengine/xrui": "^1.1.3", "@pixiv/three-vrm": "^1.0.0-beta.8", "@tweenjs/tween.js": "^18.6.4", "@vladmandic/face-api": "^1.6.1", - "@xrengine/common": "^1.1.3", - "@xrengine/hyperflux": "^1.1.3", - "@xrengine/xrui": "^1.1.3", - "@xrfoundation/volumetric": "1.0.11", "behave-graph": "^0.9.10", "bitecs": "git://github.com/NateTheGreatt/bitECS.git#056c637e05327aab8e355ebf25e9ff202b67e495", "comlink": "4.3.1", diff --git a/packages/engine/scripts/update-name-gh-package.js b/packages/engine/scripts/update-name-gh-package.js deleted file mode 100644 index 6612c1e9c6..0000000000 --- a/packages/engine/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/engine'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/engine/src/assets/classes/AssetLoader.test.ts b/packages/engine/src/assets/classes/AssetLoader.test.ts index ac2350d9a2..7722538c5c 100644 --- a/packages/engine/src/assets/classes/AssetLoader.test.ts +++ b/packages/engine/src/assets/classes/AssetLoader.test.ts @@ -2,7 +2,7 @@ import assert from 'assert' import Sinon from 'sinon' import { Mesh } from 'three' -import { createEngine, setupEngineActionSystems } from '@xrengine/engine/src/initializeEngine' +import { createEngine, setupEngineActionSystems } from '@etherealengine/engine/src/initializeEngine' import { AssetClass } from '../enum/AssetClass' import { AssetType } from '../enum/AssetType' diff --git a/packages/engine/src/assets/classes/DependencyTree.ts b/packages/engine/src/assets/classes/DependencyTree.ts index cdeb9f2577..026b4db60e 100644 --- a/packages/engine/src/assets/classes/DependencyTree.ts +++ b/packages/engine/src/assets/classes/DependencyTree.ts @@ -1,8 +1,8 @@ import { generateUUID } from 'three/src/math/MathUtils' import matches from 'ts-matches' -import { SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { defineAction, dispatchAction } from '@xrengine/hyperflux' +import { SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { defineAction, dispatchAction } from '@etherealengine/hyperflux' import { matchActionOnce } from '../../networking/functions/matchActionOnce' diff --git a/packages/engine/src/assets/classes/XRELoader.ts b/packages/engine/src/assets/classes/XRELoader.ts index 04cf0d5dc5..ed733b0510 100644 --- a/packages/engine/src/assets/classes/XRELoader.ts +++ b/packages/engine/src/assets/classes/XRELoader.ts @@ -1,7 +1,7 @@ import { FileLoader } from 'three' -import { gltfToSceneJson } from '@xrengine/engine/src/scene/functions/GLTFConversion' -import { loadECSData } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' +import { gltfToSceneJson } from '@etherealengine/engine/src/scene/functions/GLTFConversion' +import { loadECSData } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' import { Entity } from '../../ecs/classes/Entity' import { EntityOrObjectUUID } from '../../ecs/functions/EntityTree' diff --git a/packages/engine/src/assets/exporters/gltf/extensions/BasisuExporterExtension.ts b/packages/engine/src/assets/exporters/gltf/extensions/BasisuExporterExtension.ts index a0bd746922..5e44c571b4 100644 --- a/packages/engine/src/assets/exporters/gltf/extensions/BasisuExporterExtension.ts +++ b/packages/engine/src/assets/exporters/gltf/extensions/BasisuExporterExtension.ts @@ -1,7 +1,7 @@ import { ImageDataType } from '@loaders.gl/images' import { CompressedTexture, Texture } from 'three' -import { KTX2Encoder } from '@xrengine/xrui/core/textures/KTX2Encoder' +import { KTX2Encoder } from '@etherealengine/xrui/core/textures/KTX2Encoder' import createReadableTexture from '../../../functions/createReadableTexture' import { GLTFExporterPlugin, GLTFWriter } from '../GLTFExporter' diff --git a/packages/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension.ts b/packages/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension.ts index 021b3651ed..2b42040218 100644 --- a/packages/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension.ts +++ b/packages/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension.ts @@ -2,7 +2,7 @@ import { Event, LoaderUtils, Object3D } from 'three' import { generateUUID } from 'three/src/math/MathUtils' import matches, { Validator } from 'ts-matches' -import { defineAction, dispatchAction } from '@xrengine/hyperflux' +import { defineAction, dispatchAction } from '@etherealengine/hyperflux' import { AssetLoader } from '../../../classes/AssetLoader' import { getFileName, getProjectName, modelResourcesPath } from '../../../functions/pathResolver' diff --git a/packages/engine/src/assets/exporters/gltf/extensions/EEECSExporterExtension.ts b/packages/engine/src/assets/exporters/gltf/extensions/EEECSExporterExtension.ts index 82bdd32568..ae986af83c 100644 --- a/packages/engine/src/assets/exporters/gltf/extensions/EEECSExporterExtension.ts +++ b/packages/engine/src/assets/exporters/gltf/extensions/EEECSExporterExtension.ts @@ -1,6 +1,6 @@ import { Event, Object3D } from 'three' -import { ComponentJson } from '@xrengine/common/src/interfaces/SceneInterface' +import { ComponentJson } from '@etherealengine/common/src/interfaces/SceneInterface' import { ComponentMap, diff --git a/packages/engine/src/assets/functions/gpu-instancing-guide.md b/packages/engine/src/assets/functions/gpu-instancing-guide.md index e0d199e3f0..9da6f29ee9 100644 --- a/packages/engine/src/assets/functions/gpu-instancing-guide.md +++ b/packages/engine/src/assets/functions/gpu-instancing-guide.md @@ -1,11 +1,11 @@ # GPU Instancing guidelines -GPU instancing can be used to instantiate multiple copies of an object without incurring extra draw calls. This functionality has been added in the XREngine with a focus on static scene objects. -Kindly use the following guidelines to use this feature in XREngine: +GPU instancing can be used to instantiate multiple copies of an object without incurring extra draw calls. This functionality has been added in the Ethereal Engine with a focus on static scene objects. +Kindly use the following guidelines to use this feature in Ethereal Engine: 1. Model your object in some modelling tool like blender etc and make the copies as instanced versions of the original mesh. NOTE: When modelling your object, remember to only assign one material to one mesh. Mesh that have multiple materials assigned to them cannot be GPU instantiated currently. -2. Export the glb for your model and load it in the XREngine editor using Model Node. +2. Export the glb for your model and load it in the Ethereal Engine editor using Model Node. 3. Set the Using GPU instancing Flag in the given Model Node to true. NOTE: The model node can be selected as a complete object. The individual instances in the glb cannot be selected/translated in the editor. 4. Some test models are present on this path models/debug/glTF-instancing. diff --git a/packages/engine/src/assets/loaders/gltf/extensions/EEMaterialImporterExtension.ts b/packages/engine/src/assets/loaders/gltf/extensions/EEMaterialImporterExtension.ts index 94b0cc23e5..eee5f5d98e 100644 --- a/packages/engine/src/assets/loaders/gltf/extensions/EEMaterialImporterExtension.ts +++ b/packages/engine/src/assets/loaders/gltf/extensions/EEMaterialImporterExtension.ts @@ -1,6 +1,6 @@ import { Color, Material, Texture } from 'three' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { materialIdToDefaultArgs, diff --git a/packages/engine/src/assets/loaders/gltf/extensions/RegisterMaterialsExtension.ts b/packages/engine/src/assets/loaders/gltf/extensions/RegisterMaterialsExtension.ts index 598712c35e..9d4e201f32 100644 --- a/packages/engine/src/assets/loaders/gltf/extensions/RegisterMaterialsExtension.ts +++ b/packages/engine/src/assets/loaders/gltf/extensions/RegisterMaterialsExtension.ts @@ -1,7 +1,7 @@ import { Mesh, Object3D } from 'three' import { GLTFParser } from 'three/examples/jsm/loaders/GLTFLoader' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { SourceType } from '../../../../renderer/materials/components/MaterialSource' import { registerMaterial } from '../../../../renderer/materials/functions/MaterialLibraryFunctions' diff --git a/packages/engine/src/assets/loaders/usdz/USDZLoader.js b/packages/engine/src/assets/loaders/usdz/USDZLoader.js index acc3e82091..76c7a20525 100644 --- a/packages/engine/src/assets/loaders/usdz/USDZLoader.js +++ b/packages/engine/src/assets/loaders/usdz/USDZLoader.js @@ -20,7 +20,7 @@ import { import * as fflate from 'fflate'; -import { flipBufferGeometryNormals } from '@xrengine/engine/src/assets/functions/flipBufferGeometryNormals'; +import { flipBufferGeometryNormals } from '@etherealengine/engine/src/assets/functions/flipBufferGeometryNormals'; class USDAParser { diff --git a/packages/engine/src/audio/AudioState.ts b/packages/engine/src/audio/AudioState.ts index 91741945b6..afed913415 100644 --- a/packages/engine/src/audio/AudioState.ts +++ b/packages/engine/src/audio/AudioState.ts @@ -1,5 +1,5 @@ -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState, syncStateWithLocalStorage, useState } from '@xrengine/hyperflux' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState, syncStateWithLocalStorage, useState } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/audio/components/PositionalAudioComponent.ts b/packages/engine/src/audio/components/PositionalAudioComponent.ts index 6df8daa732..171fc7d027 100755 --- a/packages/engine/src/audio/components/PositionalAudioComponent.ts +++ b/packages/engine/src/audio/components/PositionalAudioComponent.ts @@ -1,8 +1,12 @@ import { useEffect } from 'react' import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry } from 'three' -import { defineComponent, hasComponent, useComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createState, getState, none, useHookstate } from '@xrengine/hyperflux/functions/StateFunctions' +import { + defineComponent, + hasComponent, + useComponent +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createState, getState, none, useHookstate } from '@etherealengine/hyperflux/functions/StateFunctions' import { AssetLoader } from '../../assets/classes/AssetLoader' import { PositionalAudioHelper } from '../../debug/PositionalAudioHelper' diff --git a/packages/engine/src/audio/systems/MediaSystem.ts b/packages/engine/src/audio/systems/MediaSystem.ts index 7c93c35b1a..2088d567c4 100755 --- a/packages/engine/src/audio/systems/MediaSystem.ts +++ b/packages/engine/src/audio/systems/MediaSystem.ts @@ -1,6 +1,6 @@ import _ from 'lodash' -import logger from '@xrengine/common/src/logger' +import logger from '@etherealengine/common/src/logger' import { addActionReceptor, createActionQueue, @@ -8,7 +8,7 @@ import { hookstate, removeActionQueue, State -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { AssetLoader } from '../../assets/classes/AssetLoader' import { isClient } from '../../common/functions/isClient' diff --git a/packages/engine/src/audio/systems/PositionalAudioSystem.ts b/packages/engine/src/audio/systems/PositionalAudioSystem.ts index 44fcb12ad6..933f66ae8d 100755 --- a/packages/engine/src/audio/systems/PositionalAudioSystem.ts +++ b/packages/engine/src/audio/systems/PositionalAudioSystem.ts @@ -2,7 +2,7 @@ import { Not } from 'bitecs' import { useEffect } from 'react' import { Quaternion, Vector3 } from 'three' -import { createActionQueue, removeActionQueue, useHookstate } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue, useHookstate } from '@etherealengine/hyperflux' import { AvatarComponent } from '../../avatar/components/AvatarComponent' import { getAvatarBoneWorldPosition } from '../../avatar/functions/avatarFunctions' diff --git a/packages/engine/src/avatar/AnimationSystem.ts b/packages/engine/src/avatar/AnimationSystem.ts index ee68cb04b0..6a2295df5f 100644 --- a/packages/engine/src/avatar/AnimationSystem.ts +++ b/packages/engine/src/avatar/AnimationSystem.ts @@ -1,6 +1,6 @@ import { Euler } from 'three' -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' import { World } from '../ecs/classes/World' diff --git a/packages/engine/src/avatar/AvatarAnimationSystem.ts b/packages/engine/src/avatar/AvatarAnimationSystem.ts index 0f0bb537e1..5d1d920b6f 100644 --- a/packages/engine/src/avatar/AvatarAnimationSystem.ts +++ b/packages/engine/src/avatar/AvatarAnimationSystem.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { Bone, MathUtils, Object3D, Vector3 } from 'three' -import { insertionSort } from '@xrengine/common/src/utils/insertionSort' +import { insertionSort } from '@etherealengine/common/src/utils/insertionSort' import { createActionQueue, defineState, @@ -9,7 +9,7 @@ import { getState, startReactor, useHookstate -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { Axis } from '../common/constants/Axis3D' import { V_000 } from '../common/constants/MathConstants' diff --git a/packages/engine/src/avatar/AvatarControllerSystem.ts b/packages/engine/src/avatar/AvatarControllerSystem.ts index 2711ecdc1f..1f1484f8f7 100755 --- a/packages/engine/src/avatar/AvatarControllerSystem.ts +++ b/packages/engine/src/avatar/AvatarControllerSystem.ts @@ -1,4 +1,4 @@ -import { addActionReceptor, createActionQueue, dispatchAction } from '@xrengine/hyperflux' +import { addActionReceptor, createActionQueue, dispatchAction } from '@etherealengine/hyperflux' import { FollowCameraComponent } from '../camera/components/FollowCameraComponent' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/avatar/AvatarInputSystem.ts b/packages/engine/src/avatar/AvatarInputSystem.ts index 398910eda9..d7ebd5aa8f 100755 --- a/packages/engine/src/avatar/AvatarInputSystem.ts +++ b/packages/engine/src/avatar/AvatarInputSystem.ts @@ -1,7 +1,7 @@ import { Quaternion } from 'three' -import { isDev } from '@xrengine/common/src/config' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { isDev } from '@etherealengine/common/src/config' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { V_000, V_010 } from '../common/constants/MathConstants' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/avatar/AvatarSpawnSystem.ts b/packages/engine/src/avatar/AvatarSpawnSystem.ts index 4d399891d0..85cc2be162 100755 --- a/packages/engine/src/avatar/AvatarSpawnSystem.ts +++ b/packages/engine/src/avatar/AvatarSpawnSystem.ts @@ -1,7 +1,7 @@ import { Quaternion, Vector3 } from 'three' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { createActionQueue, getState, removeActionQueue } from '@xrengine/hyperflux' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { createActionQueue, getState, removeActionQueue } from '@etherealengine/hyperflux' import { isClient } from '../common/functions/isClient' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/avatar/AvatarTeleportSystem.ts b/packages/engine/src/avatar/AvatarTeleportSystem.ts index 91c4d3aebb..c6c69dc9e0 100644 --- a/packages/engine/src/avatar/AvatarTeleportSystem.ts +++ b/packages/engine/src/avatar/AvatarTeleportSystem.ts @@ -13,7 +13,7 @@ import { Vector3 } from 'three' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { CameraActions } from '../camera/CameraState' import checkPositionIsValid from '../common/functions/checkPositionIsValid' diff --git a/packages/engine/src/avatar/DefaultSkeletonBones.ts b/packages/engine/src/avatar/DefaultSkeletonBones.ts index 87b833e901..4d4ac0ea6f 100644 --- a/packages/engine/src/avatar/DefaultSkeletonBones.ts +++ b/packages/engine/src/avatar/DefaultSkeletonBones.ts @@ -1,4 +1,4 @@ -/** XREngine tpose bone data from Animations.glb */ +/** tpose bone data from Animations.glb */ export const defaultBonesData = [ { name: 'Hips', diff --git a/packages/engine/src/avatar/FlyControlSystem.ts b/packages/engine/src/avatar/FlyControlSystem.ts index dbf295d293..14dd2336d9 100644 --- a/packages/engine/src/avatar/FlyControlSystem.ts +++ b/packages/engine/src/avatar/FlyControlSystem.ts @@ -1,9 +1,9 @@ import { Matrix4, Quaternion, Vector2, Vector3 } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { defineQuery, getComponent, removeQuery } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { getState } from '@xrengine/hyperflux' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { defineQuery, getComponent, removeQuery } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { getState } from '@etherealengine/hyperflux' import { V_010 } from '../common/constants/MathConstants' import { LocalTransformComponent, TransformComponent } from '../transform/components/TransformComponent' diff --git a/packages/engine/src/avatar/LICENSE.md b/packages/engine/src/avatar/LICENSE.md index 010eb373bb..34339668f9 100755 --- a/packages/engine/src/avatar/LICENSE.md +++ b/packages/engine/src/avatar/LICENSE.md @@ -1,7 +1,7 @@ ============================================================================ ============================================================================ -The XREngine IK system is derived from Exokit Avatars, created and maintained +The Ethereal Engine IK system is derived from Exokit Avatars, created and maintained by Avaer Kazmer. https://github.com/exokitxr/license diff --git a/packages/engine/src/avatar/animation/AvatarAnimationGraph.ts b/packages/engine/src/avatar/animation/AvatarAnimationGraph.ts index 5622822db5..0d0e44118d 100644 --- a/packages/engine/src/avatar/animation/AvatarAnimationGraph.ts +++ b/packages/engine/src/avatar/animation/AvatarAnimationGraph.ts @@ -1,6 +1,6 @@ import { AnimationClip, AnimationMixer, Vector2, Vector3 } from 'three' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { EngineState } from '../../ecs/classes/EngineState' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/avatar/components/AvatarAnimationComponent.ts b/packages/engine/src/avatar/components/AvatarAnimationComponent.ts index 508dd7951c..07903951cf 100755 --- a/packages/engine/src/avatar/components/AvatarAnimationComponent.ts +++ b/packages/engine/src/avatar/components/AvatarAnimationComponent.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { AxesHelper, SkeletonHelper, SkinnedMesh, Vector3 } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { proxifyQuaternion, proxifyVector3 } from '../../common/proxies/createThreejsProxy' diff --git a/packages/engine/src/avatar/components/FlyControlComponent.ts b/packages/engine/src/avatar/components/FlyControlComponent.ts index 2e798623be..7bdd4d2d69 100644 --- a/packages/engine/src/avatar/components/FlyControlComponent.ts +++ b/packages/engine/src/avatar/components/FlyControlComponent.ts @@ -1,4 +1,4 @@ -import { createMappedComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +import { createMappedComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' export type FlyControlComponentType = { moveSpeed: number diff --git a/packages/engine/src/avatar/functions/autopilotFunctions.ts b/packages/engine/src/avatar/functions/autopilotFunctions.ts index ed790337fc..e97bd9588c 100644 --- a/packages/engine/src/avatar/functions/autopilotFunctions.ts +++ b/packages/engine/src/avatar/functions/autopilotFunctions.ts @@ -3,7 +3,7 @@ import _ from 'lodash' import { CylinderGeometry, Mesh, MeshBasicMaterial, Object3D, Quaternion, Scene } from 'three' import { Vector3 } from 'three' -import { defineState, getState } from '@xrengine/hyperflux' +import { defineState, getState } from '@etherealengine/hyperflux' import { V_000, V_010 } from '../../common/constants/MathConstants' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/avatar/functions/avatarFunctions.ts b/packages/engine/src/avatar/functions/avatarFunctions.ts index 63e1fe0093..0652bc0cc2 100644 --- a/packages/engine/src/avatar/functions/avatarFunctions.ts +++ b/packages/engine/src/avatar/functions/avatarFunctions.ts @@ -1,7 +1,7 @@ import { pipe } from 'bitecs' import { AnimationClip, AnimationMixer, Bone, Box3, Group, Object3D, Skeleton, SkinnedMesh, Vector3 } from 'three' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { AssetLoader } from '../../assets/classes/AssetLoader' import { AssetType } from '../../assets/enum/AssetType' diff --git a/packages/engine/src/avatar/functions/moveAvatar.test.ts b/packages/engine/src/avatar/functions/moveAvatar.test.ts index ca2b67100b..8d56413200 100644 --- a/packages/engine/src/avatar/functions/moveAvatar.test.ts +++ b/packages/engine/src/avatar/functions/moveAvatar.test.ts @@ -1,8 +1,8 @@ import assert, { strictEqual } from 'assert' import { PerspectiveCamera, Quaternion, Vector3 } from 'three' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { getState } from '@xrengine/hyperflux' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { getState } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { EngineState } from '../../ecs/classes/EngineState' diff --git a/packages/engine/src/avatar/functions/moveAvatar.ts b/packages/engine/src/avatar/functions/moveAvatar.ts index 10d735e386..e0bfd90767 100755 --- a/packages/engine/src/avatar/functions/moveAvatar.ts +++ b/packages/engine/src/avatar/functions/moveAvatar.ts @@ -1,8 +1,8 @@ import { QueryFilterFlags } from '@dimforge/rapier3d-compat' import { Euler, Matrix4, Quaternion, Vector3 } from 'three' -import { smootheLerpAlpha } from '@xrengine/common/src/utils/smootheLerpAlpha' -import { getState } from '@xrengine/hyperflux' +import { smootheLerpAlpha } from '@etherealengine/common/src/utils/smootheLerpAlpha' +import { getState } from '@etherealengine/hyperflux' import { ObjectDirection } from '../../common/constants/Axis3D' import { V_000, V_010 } from '../../common/constants/MathConstants' diff --git a/packages/engine/src/avatar/functions/spawnAvatarReceptor.test.ts b/packages/engine/src/avatar/functions/spawnAvatarReceptor.test.ts index aeb28b62fb..7ce1b4ebfb 100644 --- a/packages/engine/src/avatar/functions/spawnAvatarReceptor.test.ts +++ b/packages/engine/src/avatar/functions/spawnAvatarReceptor.test.ts @@ -1,7 +1,7 @@ import assert, { strictEqual } from 'assert' import { Quaternion, Vector3 } from 'three' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { Engine } from '../../ecs/classes/Engine' import { hasComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/avatar/functions/spawnAvatarReceptor.ts b/packages/engine/src/avatar/functions/spawnAvatarReceptor.ts index c440fd5486..88ee171de1 100644 --- a/packages/engine/src/avatar/functions/spawnAvatarReceptor.ts +++ b/packages/engine/src/avatar/functions/spawnAvatarReceptor.ts @@ -7,7 +7,7 @@ import { } from '@dimforge/rapier3d-compat' import { AnimationClip, AnimationMixer, Group, Object3D, Quaternion, Vector3 } from 'three' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { setTargetCameraRotation } from '../../camera/systems/CameraInputSystem' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/avatar/state/AvatarInputSettingsState.ts b/packages/engine/src/avatar/state/AvatarInputSettingsState.ts index 9e759c740f..12f454fa9b 100644 --- a/packages/engine/src/avatar/state/AvatarInputSettingsState.ts +++ b/packages/engine/src/avatar/state/AvatarInputSettingsState.ts @@ -1,5 +1,5 @@ -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { XR_FOLLOW_MODE, XR_ROTATION_MODE } from '@xrengine/engine/src/xr/XRUserSettings' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { XR_FOLLOW_MODE, XR_ROTATION_MODE } from '@etherealengine/engine/src/xr/XRUserSettings' import { defineAction, defineState, @@ -7,7 +7,7 @@ import { getState, syncStateWithLocalStorage, useState -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' export const AvatarAxesControlScheme = { Move: 'AvatarControlScheme_Move' as const, diff --git a/packages/engine/src/avatar/state/AvatarMovementSettingsState.ts b/packages/engine/src/avatar/state/AvatarMovementSettingsState.ts index a73d6f96ca..282050a8d3 100644 --- a/packages/engine/src/avatar/state/AvatarMovementSettingsState.ts +++ b/packages/engine/src/avatar/state/AvatarMovementSettingsState.ts @@ -1,4 +1,4 @@ -import { defineState } from '@xrengine/hyperflux' +import { defineState } from '@etherealengine/hyperflux' export const AvatarMovementSettingsState = defineState({ name: 'AvatarMovementSettingsState', diff --git a/packages/engine/src/behave-graph/components/BehaveGraphComponent.ts b/packages/engine/src/behave-graph/components/BehaveGraphComponent.ts index 0ac6c1cbbc..6c7b22b4c7 100644 --- a/packages/engine/src/behave-graph/components/BehaveGraphComponent.ts +++ b/packages/engine/src/behave-graph/components/BehaveGraphComponent.ts @@ -1,7 +1,7 @@ import { GraphJSON, Registry } from 'behave-graph' import matches, { Validator } from 'ts-matches' -import { OpaqueType } from '@xrengine/common/src/interfaces/OpaqueType' +import { OpaqueType } from '@etherealengine/common/src/interfaces/OpaqueType' import { defineComponent, hasComponent, removeComponent } from '../../ecs/functions/ComponentFunctions' import { RuntimeGraphComponent } from './RuntimeGraphComponent' diff --git a/packages/engine/src/behave-graph/components/RuntimeGraphComponent.ts b/packages/engine/src/behave-graph/components/RuntimeGraphComponent.ts index 013f18201e..9d40516e23 100644 --- a/packages/engine/src/behave-graph/components/RuntimeGraphComponent.ts +++ b/packages/engine/src/behave-graph/components/RuntimeGraphComponent.ts @@ -7,7 +7,7 @@ import { Registry } from 'behave-graph' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { defineComponent, getComponent } from '../../ecs/functions/ComponentFunctions' import { BehaveGraphSystemState } from '../systems/BehaveGraphSystem' diff --git a/packages/engine/src/behave-graph/systems/BehaveGraphSystem.ts b/packages/engine/src/behave-graph/systems/BehaveGraphSystem.ts index b9d0b5a5c4..1d1ee1c709 100644 --- a/packages/engine/src/behave-graph/systems/BehaveGraphSystem.ts +++ b/packages/engine/src/behave-graph/systems/BehaveGraphSystem.ts @@ -1,7 +1,7 @@ import { ILifecycleEventEmitter, ILogger, Registry } from 'behave-graph' import { matches, Validator } from 'ts-matches' -import { createActionQueue, defineAction, defineState, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, defineAction, defineState, removeActionQueue } from '@etherealengine/hyperflux' import { Entity } from '../../ecs/classes/Entity' import { World } from '../../ecs/classes/World' diff --git a/packages/engine/src/camera/CameraState.ts b/packages/engine/src/camera/CameraState.ts index e21f0d3d2c..f2a5cd4c11 100644 --- a/packages/engine/src/camera/CameraState.ts +++ b/packages/engine/src/camera/CameraState.ts @@ -1,6 +1,6 @@ import matches from 'ts-matches' -import { defineAction, defineState } from '@xrengine/hyperflux' +import { defineAction, defineState } from '@etherealengine/hyperflux' export const CameraSettings = defineState({ name: 'xre.engine.CameraSettings', diff --git a/packages/engine/src/camera/components/SpectatorComponent.ts b/packages/engine/src/camera/components/SpectatorComponent.ts index 9729355526..0c9c5f7b66 100644 --- a/packages/engine/src/camera/components/SpectatorComponent.ts +++ b/packages/engine/src/camera/components/SpectatorComponent.ts @@ -1,4 +1,4 @@ -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { createMappedComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/camera/systems/CameraFadeBlackEffectSystem.ts b/packages/engine/src/camera/systems/CameraFadeBlackEffectSystem.ts index 248e5c2a55..5c2b4b9eca 100644 --- a/packages/engine/src/camera/systems/CameraFadeBlackEffectSystem.ts +++ b/packages/engine/src/camera/systems/CameraFadeBlackEffectSystem.ts @@ -1,6 +1,6 @@ import { Color, Mesh, PlaneGeometry, ShaderMaterial } from 'three' -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { World } from '../../ecs/classes/World' import { addObjectToGroup } from '../../scene/components/GroupComponent' diff --git a/packages/engine/src/camera/systems/CameraInputSystem.ts b/packages/engine/src/camera/systems/CameraInputSystem.ts index 0a483a16ff..c671edb152 100644 --- a/packages/engine/src/camera/systems/CameraInputSystem.ts +++ b/packages/engine/src/camera/systems/CameraInputSystem.ts @@ -2,7 +2,7 @@ import { clamp } from 'lodash' import { useEffect } from 'react' import { Vector2 } from 'three' -import { getState, startReactor, useHookstate } from '@xrengine/hyperflux' +import { getState, startReactor, useHookstate } from '@etherealengine/hyperflux' import { AvatarControllerComponent } from '../../avatar/components/AvatarControllerComponent' import { switchCameraMode } from '../../avatar/functions/switchCameraMode' diff --git a/packages/engine/src/camera/systems/CameraSystem.ts b/packages/engine/src/camera/systems/CameraSystem.ts index 68115d5a2f..3ee757e8ce 100755 --- a/packages/engine/src/camera/systems/CameraSystem.ts +++ b/packages/engine/src/camera/systems/CameraSystem.ts @@ -2,8 +2,8 @@ import _ from 'lodash' import { useEffect } from 'react' import { MathUtils, Matrix4, PerspectiveCamera, Raycaster, Vector3 } from 'three' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { deleteSearchParams } from '@xrengine/common/src/utils/deleteSearchParams' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { deleteSearchParams } from '@etherealengine/common/src/utils/deleteSearchParams' import { createActionQueue, dispatchAction, @@ -12,7 +12,7 @@ import { startReactor, State, useHookstate -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { AvatarComponent } from '../../avatar/components/AvatarComponent' import { FlyControlComponent } from '../../avatar/components/FlyControlComponent' diff --git a/packages/engine/src/common/functions/MatchesUtils.ts b/packages/engine/src/common/functions/MatchesUtils.ts index b582595a66..951ef357b3 100644 --- a/packages/engine/src/common/functions/MatchesUtils.ts +++ b/packages/engine/src/common/functions/MatchesUtils.ts @@ -1,10 +1,10 @@ import { Quaternion, Vector3 } from 'three' import { matches, Validator } from 'ts-matches' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/debug/systems/DebugRendererSystem.ts b/packages/engine/src/debug/systems/DebugRendererSystem.ts index 00f8918e0f..0d16f54692 100644 --- a/packages/engine/src/debug/systems/DebugRendererSystem.ts +++ b/packages/engine/src/debug/systems/DebugRendererSystem.ts @@ -1,6 +1,6 @@ import { BufferAttribute, BufferGeometry, Line, LineBasicMaterial, LineSegments, Vector3 } from 'three' -import { createActionQueue, getState, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, getState, removeActionQueue } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { EngineActions } from '../../ecs/classes/EngineState' diff --git a/packages/engine/src/ecs/LICENSE.md b/packages/engine/src/ecs/LICENSE.md deleted file mode 100755 index f59e4a79e6..0000000000 --- a/packages/engine/src/ecs/LICENSE.md +++ /dev/null @@ -1,33 +0,0 @@ -============================================================================ -============================================================================ - -The XREngine ECS engine is derived from ECSY -https://github.com/ecsyjs/ecsy - -The original license is provided here as is. - -============================================================================ -============================================================================ - - -MIT License - -Copyright (c) 2020 Mozilla - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/packages/engine/src/ecs/PriorityQueue.ts b/packages/engine/src/ecs/PriorityQueue.ts index 74e1c54b41..828216340b 100644 --- a/packages/engine/src/ecs/PriorityQueue.ts +++ b/packages/engine/src/ecs/PriorityQueue.ts @@ -1,4 +1,4 @@ -import { DeepReadonly } from '@xrengine/common/src/DeepReadonly' +import { DeepReadonly } from '@etherealengine/common/src/DeepReadonly' import { Entity } from './classes/Entity' import { entityExists } from './functions/EntityFunctions' diff --git a/packages/engine/src/ecs/classes/Engine.ts b/packages/engine/src/ecs/classes/Engine.ts index d6e2418a32..7f4793a8b8 100755 --- a/packages/engine/src/ecs/classes/Engine.ts +++ b/packages/engine/src/ecs/classes/Engine.ts @@ -1,7 +1,7 @@ -import type { UserId } from '@xrengine/common/src/interfaces/UserId' -import { createHyperStore, getState } from '@xrengine/hyperflux' -import * as Hyperflux from '@xrengine/hyperflux' -import { HyperStore } from '@xrengine/hyperflux/functions/StoreFunctions' +import type { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { createHyperStore, getState } from '@etherealengine/hyperflux' +import * as Hyperflux from '@etherealengine/hyperflux' +import { HyperStore } from '@etherealengine/hyperflux/functions/StoreFunctions' import { NetworkTopics } from '../../networking/classes/Network' import type { World } from '../classes/World' diff --git a/packages/engine/src/ecs/classes/EngineState.ts b/packages/engine/src/ecs/classes/EngineState.ts index 2f2244c99c..0675055e4a 100644 --- a/packages/engine/src/ecs/classes/EngineState.ts +++ b/packages/engine/src/ecs/classes/EngineState.ts @@ -1,4 +1,4 @@ -import { defineAction, defineState, getState, useState } from '@xrengine/hyperflux' +import { defineAction, defineState, getState, useState } from '@etherealengine/hyperflux' import { matches, matchesEntity, Validator } from '../../common/functions/MatchesUtils' import { Entity } from './Entity' diff --git a/packages/engine/src/ecs/classes/Entity.ts b/packages/engine/src/ecs/classes/Entity.ts index 2f2436d230..2de8e5f202 100755 --- a/packages/engine/src/ecs/classes/Entity.ts +++ b/packages/engine/src/ecs/classes/Entity.ts @@ -1,4 +1,4 @@ -import { OpaqueType } from '@xrengine/common/src/interfaces/OpaqueType' +import { OpaqueType } from '@etherealengine/common/src/interfaces/OpaqueType' export type Entity = OpaqueType<'entity'> & number diff --git a/packages/engine/src/ecs/classes/World.ts b/packages/engine/src/ecs/classes/World.ts index a553a25024..67ac3ec223 100644 --- a/packages/engine/src/ecs/classes/World.ts +++ b/packages/engine/src/ecs/classes/World.ts @@ -20,12 +20,12 @@ import { Vector2 } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { ComponentJson, SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { getState } from '@xrengine/hyperflux' -import { createState, hookstate } from '@xrengine/hyperflux/functions/StateFunctions' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { ComponentJson, SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { getState } from '@etherealengine/hyperflux' +import { createState, hookstate } from '@etherealengine/hyperflux/functions/StateFunctions' import { DEFAULT_LOD_DISTANCES } from '../../assets/constants/LoaderConstants' import { AvatarComponent } from '../../avatar/components/AvatarComponent' diff --git a/packages/engine/src/ecs/functions/ComponentFunctions.ts b/packages/engine/src/ecs/functions/ComponentFunctions.ts index be24ebde29..3ca607f562 100755 --- a/packages/engine/src/ecs/functions/ComponentFunctions.ts +++ b/packages/engine/src/ecs/functions/ComponentFunctions.ts @@ -1,14 +1,14 @@ import * as bitECS from 'bitecs' import React, { startTransition, useEffect, useLayoutEffect } from 'react' -import config from '@xrengine/common/src/config' -import { DeepReadonly } from '@xrengine/common/src/DeepReadonly' -import multiLogger from '@xrengine/common/src/logger' -import { HookableFunction } from '@xrengine/common/src/utils/createHookableFunction' -import { getNestedObject } from '@xrengine/common/src/utils/getNestedProperty' -import { useForceUpdate } from '@xrengine/common/src/utils/useForceUpdate' -import { startReactor } from '@xrengine/hyperflux' -import { hookstate, NO_PROXY, none, State, useHookstate } from '@xrengine/hyperflux/functions/StateFunctions' +import config from '@etherealengine/common/src/config' +import { DeepReadonly } from '@etherealengine/common/src/DeepReadonly' +import multiLogger from '@etherealengine/common/src/logger' +import { HookableFunction } from '@etherealengine/common/src/utils/createHookableFunction' +import { getNestedObject } from '@etherealengine/common/src/utils/getNestedProperty' +import { useForceUpdate } from '@etherealengine/common/src/utils/useForceUpdate' +import { startReactor } from '@etherealengine/hyperflux' +import { hookstate, NO_PROXY, none, State, useHookstate } from '@etherealengine/hyperflux/functions/StateFunctions' import { Engine } from '../classes/Engine' import { Entity } from '../classes/Entity' diff --git a/packages/engine/src/ecs/functions/EngineFunctions.ts b/packages/engine/src/ecs/functions/EngineFunctions.ts index 862795a094..3f748e8ba8 100755 --- a/packages/engine/src/ecs/functions/EngineFunctions.ts +++ b/packages/engine/src/ecs/functions/EngineFunctions.ts @@ -1,7 +1,7 @@ /** Functions to provide engine level functionalities. */ import { Object3D } from 'three' -import { dispatchAction } from '@xrengine/hyperflux' +import { dispatchAction } from '@etherealengine/hyperflux' import { SceneObjectComponent } from '../../scene/components/SceneObjectComponent' import { Engine } from '../classes/Engine' diff --git a/packages/engine/src/ecs/functions/EntityFunctions.tsx b/packages/engine/src/ecs/functions/EntityFunctions.tsx index 453d68d07f..bbe43d8374 100644 --- a/packages/engine/src/ecs/functions/EntityFunctions.tsx +++ b/packages/engine/src/ecs/functions/EntityFunctions.tsx @@ -1,6 +1,6 @@ import * as bitECS from 'bitecs' -import { ReactorRoot } from '@xrengine/hyperflux' +import { ReactorRoot } from '@etherealengine/hyperflux' import { Engine } from '../classes/Engine' import { Entity } from '../classes/Entity' diff --git a/packages/engine/src/ecs/functions/EntityTree.test.ts b/packages/engine/src/ecs/functions/EntityTree.test.ts index a337207d85..69bc6d7429 100644 --- a/packages/engine/src/ecs/functions/EntityTree.test.ts +++ b/packages/engine/src/ecs/functions/EntityTree.test.ts @@ -1,6 +1,6 @@ import assert from 'assert' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' import { createEngine } from '../../initializeEngine' import { NameComponent } from '../../scene/components/NameComponent' diff --git a/packages/engine/src/ecs/functions/EntityTree.ts b/packages/engine/src/ecs/functions/EntityTree.ts index e2eb311edf..9be2da90b3 100644 --- a/packages/engine/src/ecs/functions/EntityTree.ts +++ b/packages/engine/src/ecs/functions/EntityTree.ts @@ -1,7 +1,7 @@ import { MathUtils } from 'three' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { getState, hookstate, NO_PROXY, none } from '@xrengine/hyperflux' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { getState, hookstate, NO_PROXY, none } from '@etherealengine/hyperflux' import { matchesEntity, matchesEntityUUID } from '../../common/functions/MatchesUtils' import { NameComponent } from '../../scene/components/NameComponent' diff --git a/packages/engine/src/ecs/functions/FixedPipelineSystem.test.ts b/packages/engine/src/ecs/functions/FixedPipelineSystem.test.ts index 351726fb0d..72964dd5af 100644 --- a/packages/engine/src/ecs/functions/FixedPipelineSystem.test.ts +++ b/packages/engine/src/ecs/functions/FixedPipelineSystem.test.ts @@ -1,6 +1,6 @@ import assert from 'assert' -import { defineState, getState } from '@xrengine/hyperflux' +import { defineState, getState } from '@etherealengine/hyperflux' import { createEngine, setupEngineActionSystems } from '../../initializeEngine' import { Engine } from '../classes/Engine' diff --git a/packages/engine/src/ecs/functions/FixedPipelineSystem.ts b/packages/engine/src/ecs/functions/FixedPipelineSystem.ts index 095f28f2a8..b37b248391 100644 --- a/packages/engine/src/ecs/functions/FixedPipelineSystem.ts +++ b/packages/engine/src/ecs/functions/FixedPipelineSystem.ts @@ -1,4 +1,4 @@ -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { nowMilliseconds } from '../../common/functions/nowMilliseconds' import { EngineState } from '../classes/EngineState' diff --git a/packages/engine/src/ecs/functions/SystemFunctions.tsx b/packages/engine/src/ecs/functions/SystemFunctions.tsx index e72ae14714..8fb0682994 100755 --- a/packages/engine/src/ecs/functions/SystemFunctions.tsx +++ b/packages/engine/src/ecs/functions/SystemFunctions.tsx @@ -3,8 +3,8 @@ import * as bitECS from 'bitecs' import React from 'react' -import multiLogger from '@xrengine/common/src/logger' -import { ReactorProps, ReactorRoot, startReactor } from '@xrengine/hyperflux' +import multiLogger from '@etherealengine/common/src/logger' +import { ReactorProps, ReactorRoot, startReactor } from '@etherealengine/hyperflux' import { nowMilliseconds } from '../../common/functions/nowMilliseconds' import { World } from '../classes/World' diff --git a/packages/engine/src/ecs/functions/getSceneMetadataChanges.ts b/packages/engine/src/ecs/functions/getSceneMetadataChanges.ts index d48585e73c..67cf910b7b 100644 --- a/packages/engine/src/ecs/functions/getSceneMetadataChanges.ts +++ b/packages/engine/src/ecs/functions/getSceneMetadataChanges.ts @@ -1,6 +1,6 @@ import { diff } from 'deep-object-diff' -import { NO_PROXY } from '@xrengine/hyperflux' +import { NO_PROXY } from '@etherealengine/hyperflux' import { World } from '../classes/World' diff --git a/packages/engine/src/initializeEngine.ts b/packages/engine/src/initializeEngine.ts index b370370fb5..ed69bcf344 100644 --- a/packages/engine/src/initializeEngine.ts +++ b/packages/engine/src/initializeEngine.ts @@ -1,7 +1,7 @@ import _ from 'lodash' -import { BotUserAgent } from '@xrengine/common/src/constants/BotUserAgent' -import { addActionReceptor, dispatchAction, getState } from '@xrengine/hyperflux' +import { BotUserAgent } from '@etherealengine/common/src/constants/BotUserAgent' +import { addActionReceptor, dispatchAction, getState } from '@etherealengine/hyperflux' import { Timer } from './common/functions/Timer' import { Engine } from './ecs/classes/Engine' diff --git a/packages/engine/src/interaction/components/BoundingBoxComponents.ts b/packages/engine/src/interaction/components/BoundingBoxComponents.ts index 68c9a9cd00..6740ab38a1 100755 --- a/packages/engine/src/interaction/components/BoundingBoxComponents.ts +++ b/packages/engine/src/interaction/components/BoundingBoxComponents.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { Box3, Box3Helper } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/interaction/functions/equippableFunctions.test.ts b/packages/engine/src/interaction/functions/equippableFunctions.test.ts index f9033fc952..bf677bd11f 100644 --- a/packages/engine/src/interaction/functions/equippableFunctions.test.ts +++ b/packages/engine/src/interaction/functions/equippableFunctions.test.ts @@ -1,8 +1,8 @@ import assert from 'assert' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { createMockNetwork } from '../../../tests/util/createMockNetwork' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/interaction/functions/equippableFunctions.ts b/packages/engine/src/interaction/functions/equippableFunctions.ts index 60340df7cc..519bcd5458 100755 --- a/packages/engine/src/interaction/functions/equippableFunctions.ts +++ b/packages/engine/src/interaction/functions/equippableFunctions.ts @@ -1,4 +1,4 @@ -import { dispatchAction } from '@xrengine/hyperflux' +import { dispatchAction } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/interaction/functions/gatherAvailableInteractables.ts b/packages/engine/src/interaction/functions/gatherAvailableInteractables.ts index c09efa12d1..0014673437 100644 --- a/packages/engine/src/interaction/functions/gatherAvailableInteractables.ts +++ b/packages/engine/src/interaction/functions/gatherAvailableInteractables.ts @@ -1,6 +1,6 @@ import { Frustum, Matrix4, PerspectiveCamera, Vector3 } from 'three' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { AvatarControllerComponent } from '../../avatar/components/AvatarControllerComponent' import { CameraComponent } from '../../camera/components/CameraComponent' diff --git a/packages/engine/src/interaction/functions/interactUI.ts b/packages/engine/src/interaction/functions/interactUI.ts index 99c25bf79f..f4414711fe 100755 --- a/packages/engine/src/interaction/functions/interactUI.ts +++ b/packages/engine/src/interaction/functions/interactUI.ts @@ -1,4 +1,4 @@ -import { WebLayer3D } from '@xrengine/xrui' +import { WebLayer3D } from '@etherealengine/xrui' import { Engine } from '../../ecs/classes/Engine' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/interaction/functions/mediaControlsUI.ts b/packages/engine/src/interaction/functions/mediaControlsUI.ts index 935d9ce90d..cdb51a525c 100644 --- a/packages/engine/src/interaction/functions/mediaControlsUI.ts +++ b/packages/engine/src/interaction/functions/mediaControlsUI.ts @@ -1,4 +1,4 @@ -import { WebLayer3D } from '@xrengine/xrui' +import { WebLayer3D } from '@etherealengine/xrui' import { Entity } from '../../ecs/classes/Entity' import { addComponent, getComponent, setComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/interaction/systems/EquippableSystem.test.ts b/packages/engine/src/interaction/systems/EquippableSystem.test.ts index d73501bc42..575d199d3f 100644 --- a/packages/engine/src/interaction/systems/EquippableSystem.test.ts +++ b/packages/engine/src/interaction/systems/EquippableSystem.test.ts @@ -1,8 +1,8 @@ import assert, { strictEqual } from 'assert' import { Quaternion, Vector3 } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' import { getHandTarget } from '../../avatar/components/AvatarIKComponents' import { spawnAvatarReceptor } from '../../avatar/functions/spawnAvatarReceptor' diff --git a/packages/engine/src/interaction/systems/EquippableSystem.ts b/packages/engine/src/interaction/systems/EquippableSystem.ts index ecfbaf7cd2..85ab1a102c 100644 --- a/packages/engine/src/interaction/systems/EquippableSystem.ts +++ b/packages/engine/src/interaction/systems/EquippableSystem.ts @@ -9,7 +9,7 @@ import { removeActionQueue, startReactor, useHookstate -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { getHandTarget } from '../../avatar/components/AvatarIKComponents' import { isClient } from '../../common/functions/isClient' diff --git a/packages/engine/src/interaction/systems/InteractiveSystem.ts b/packages/engine/src/interaction/systems/InteractiveSystem.ts index 286d4d04b1..c4fc93aa66 100755 --- a/packages/engine/src/interaction/systems/InteractiveSystem.ts +++ b/packages/engine/src/interaction/systems/InteractiveSystem.ts @@ -1,8 +1,8 @@ import { Not } from 'bitecs' import { Vector3 } from 'three' -import { defineState, getState } from '@xrengine/hyperflux' -import { WebLayer3D } from '@xrengine/xrui' +import { defineState, getState } from '@etherealengine/hyperflux' +import { WebLayer3D } from '@etherealengine/xrui' import { AvatarComponent } from '../../avatar/components/AvatarComponent' import { getAvatarBoneWorldPosition } from '../../avatar/functions/avatarFunctions' diff --git a/packages/engine/src/interaction/systems/MediaControlSystem.ts b/packages/engine/src/interaction/systems/MediaControlSystem.ts index fe8d11d2c5..c4f59393bb 100644 --- a/packages/engine/src/interaction/systems/MediaControlSystem.ts +++ b/packages/engine/src/interaction/systems/MediaControlSystem.ts @@ -1,4 +1,4 @@ -import { WebLayer3D } from '@xrengine/xrui' +import { WebLayer3D } from '@etherealengine/xrui' import { Engine } from '../../ecs/classes/Engine' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/interaction/systems/MountPointSystem.ts b/packages/engine/src/interaction/systems/MountPointSystem.ts index 56859470da..b2662348f8 100755 --- a/packages/engine/src/interaction/systems/MountPointSystem.ts +++ b/packages/engine/src/interaction/systems/MountPointSystem.ts @@ -1,6 +1,6 @@ import { Box3, Object3D, Vector3 } from 'three' -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { changeState } from '../../avatar/animation/AnimationGraph' import { AvatarStates } from '../../avatar/animation/Util' diff --git a/packages/engine/src/interaction/ui/MediaControlsUI.tsx b/packages/engine/src/interaction/ui/MediaControlsUI.tsx index d410828f1c..0925bd2c7a 100644 --- a/packages/engine/src/interaction/ui/MediaControlsUI.tsx +++ b/packages/engine/src/interaction/ui/MediaControlsUI.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { useHookstate } from '@xrengine/hyperflux' +import { useHookstate } from '@etherealengine/hyperflux' import { Pause, PlayArrow } from '@mui/icons-material' diff --git a/packages/engine/src/networking/MediaSettingsState.ts b/packages/engine/src/networking/MediaSettingsState.ts index 83f5f9e4d9..6a5887b289 100644 --- a/packages/engine/src/networking/MediaSettingsState.ts +++ b/packages/engine/src/networking/MediaSettingsState.ts @@ -1,5 +1,5 @@ -import { matches } from '@xrengine/engine/src/common/functions/MatchesUtils' -import { defineAction, defineState, getState, syncStateWithLocalStorage } from '@xrengine/hyperflux' +import { matches } from '@etherealengine/engine/src/common/functions/MatchesUtils' +import { defineAction, defineState, getState, syncStateWithLocalStorage } from '@etherealengine/hyperflux' import { AudioState, getPositionalMedia } from '../audio/AudioState' import { getMediaSceneMetadataState } from '../audio/systems/MediaSystem' diff --git a/packages/engine/src/networking/classes/Network.ts b/packages/engine/src/networking/classes/Network.ts index a87ca37df7..642e57eb53 100755 --- a/packages/engine/src/networking/classes/Network.ts +++ b/packages/engine/src/networking/classes/Network.ts @@ -1,6 +1,6 @@ -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { Topic } from '@xrengine/hyperflux/functions/ActionFunctions' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { Topic } from '@etherealengine/hyperflux/functions/ActionFunctions' import { RingBuffer } from '../../common/classes/RingBuffer' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/networking/components/NetworkObjectComponent.ts b/packages/engine/src/networking/components/NetworkObjectComponent.ts index 6252446d92..8bf9fb8b16 100755 --- a/packages/engine/src/networking/components/NetworkObjectComponent.ts +++ b/packages/engine/src/networking/components/NetworkObjectComponent.ts @@ -1,8 +1,8 @@ import { Types } from 'bitecs' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { defineComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/networking/functions/NetworkPeerFunctions.test.ts b/packages/engine/src/networking/functions/NetworkPeerFunctions.test.ts index 0a3955233f..c9f3222f58 100644 --- a/packages/engine/src/networking/functions/NetworkPeerFunctions.test.ts +++ b/packages/engine/src/networking/functions/NetworkPeerFunctions.test.ts @@ -1,9 +1,9 @@ import assert from 'assert' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { applyIncomingActions, clearOutgoingActions, getState } from '@xrengine/hyperflux' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { applyIncomingActions, clearOutgoingActions, getState } from '@etherealengine/hyperflux' import { createMockNetwork } from '../../../tests/util/createMockNetwork' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/networking/functions/NetworkPeerFunctions.ts b/packages/engine/src/networking/functions/NetworkPeerFunctions.ts index 6d2dcaa15a..d1f2aadcd7 100644 --- a/packages/engine/src/networking/functions/NetworkPeerFunctions.ts +++ b/packages/engine/src/networking/functions/NetworkPeerFunctions.ts @@ -1,10 +1,10 @@ import { Validator } from 'ts-matches' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { getState } from '@xrengine/hyperflux' -import { Action, ActionShape, ResolvedActionType } from '@xrengine/hyperflux/functions/ActionFunctions' -import { none } from '@xrengine/hyperflux/functions/StateFunctions' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { getState } from '@etherealengine/hyperflux' +import { Action, ActionShape, ResolvedActionType } from '@etherealengine/hyperflux/functions/ActionFunctions' +import { none } from '@etherealengine/hyperflux/functions/StateFunctions' import { Engine } from '../../ecs/classes/Engine' import { getComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/networking/functions/WorldNetworkAction.ts b/packages/engine/src/networking/functions/WorldNetworkAction.ts index 5b8d5a05c5..41e75ec916 100644 --- a/packages/engine/src/networking/functions/WorldNetworkAction.ts +++ b/packages/engine/src/networking/functions/WorldNetworkAction.ts @@ -1,4 +1,4 @@ -import { defineAction } from '@xrengine/hyperflux' +import { defineAction } from '@etherealengine/hyperflux' import { matchesWeightsParameters } from '../../avatar/animation/Util' import { diff --git a/packages/engine/src/networking/functions/WorldNetworkActionReceptor.test.ts b/packages/engine/src/networking/functions/WorldNetworkActionReceptor.test.ts index ec97e97271..78797862f2 100644 --- a/packages/engine/src/networking/functions/WorldNetworkActionReceptor.test.ts +++ b/packages/engine/src/networking/functions/WorldNetworkActionReceptor.test.ts @@ -1,9 +1,9 @@ import assert from 'assert' import { Quaternion, Vector3 } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { createMockNetwork } from '../../../tests/util/createMockNetwork' import { AvatarComponent } from '../../avatar/components/AvatarComponent' diff --git a/packages/engine/src/networking/functions/WorldNetworkActionReceptor.ts b/packages/engine/src/networking/functions/WorldNetworkActionReceptor.ts index 5a4ce9d941..7ae1c74d30 100644 --- a/packages/engine/src/networking/functions/WorldNetworkActionReceptor.ts +++ b/packages/engine/src/networking/functions/WorldNetworkActionReceptor.ts @@ -1,8 +1,8 @@ import { none } from '@hookstate/core' import { Quaternion, Vector3 } from 'three' -import { PeerID, SelfPeerID } from '@xrengine/common/src/interfaces/PeerID' -import { dispatchAction } from '@xrengine/hyperflux' +import { PeerID, SelfPeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { dispatchAction } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { getEngineState } from '../../ecs/classes/EngineState' diff --git a/packages/engine/src/networking/functions/getNearbyUsers.ts b/packages/engine/src/networking/functions/getNearbyUsers.ts index 10aa12aac2..e9a2ba245c 100644 --- a/packages/engine/src/networking/functions/getNearbyUsers.ts +++ b/packages/engine/src/networking/functions/getNearbyUsers.ts @@ -1,6 +1,6 @@ import { Not } from 'bitecs' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { AvatarComponent } from '../../avatar/components/AvatarComponent' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/networking/functions/matchActionOnce.ts b/packages/engine/src/networking/functions/matchActionOnce.ts index d7d0d88f38..e7c00d639e 100644 --- a/packages/engine/src/networking/functions/matchActionOnce.ts +++ b/packages/engine/src/networking/functions/matchActionOnce.ts @@ -1,6 +1,6 @@ import matches, { Validator } from 'ts-matches' -import { addActionReceptor, removeActionReceptor } from '@xrengine/hyperflux' +import { addActionReceptor, removeActionReceptor } from '@etherealengine/hyperflux' /** * @deprecated diff --git a/packages/engine/src/networking/functions/receiveJoinWorld.ts b/packages/engine/src/networking/functions/receiveJoinWorld.ts index 2f5bb4f9e9..d68d58e3ea 100644 --- a/packages/engine/src/networking/functions/receiveJoinWorld.ts +++ b/packages/engine/src/networking/functions/receiveJoinWorld.ts @@ -1,10 +1,10 @@ // spawnPose is temporary - just so portals work for now - will be removed in favor of instanceserver-instanceserver communication import { Quaternion, Vector3 } from 'three' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { getSearchParamFromURL } from '@xrengine/common/src/utils/getSearchParamFromURL' -import { dispatchAction, getState } from '@xrengine/hyperflux' -import { Action } from '@xrengine/hyperflux/functions/ActionFunctions' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { getSearchParamFromURL } from '@etherealengine/common/src/utils/getSearchParamFromURL' +import { dispatchAction, getState } from '@etherealengine/hyperflux' +import { Action } from '@etherealengine/hyperflux/functions/ActionFunctions' import { Engine } from '../../ecs/classes/Engine' import { EngineActions } from '../../ecs/classes/EngineState' diff --git a/packages/engine/src/networking/interfaces/NetworkPeer.ts b/packages/engine/src/networking/interfaces/NetworkPeer.ts index dee83ccb5c..6f6ee61ea5 100644 --- a/packages/engine/src/networking/interfaces/NetworkPeer.ts +++ b/packages/engine/src/networking/interfaces/NetworkPeer.ts @@ -1,9 +1,9 @@ import { Spark } from 'primus' -import { MediaTagType } from '@xrengine/common/src/interfaces/MediaStreamConstants' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { MediaTagType } from '@etherealengine/common/src/interfaces/MediaStreamConstants' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' export interface NetworkPeer { userId: UserId diff --git a/packages/engine/src/networking/interfaces/WorldState.ts b/packages/engine/src/networking/interfaces/WorldState.ts index af6febddb2..a72b005c34 100755 --- a/packages/engine/src/networking/interfaces/WorldState.ts +++ b/packages/engine/src/networking/interfaces/WorldState.ts @@ -1,7 +1,7 @@ import matches from 'ts-matches' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { defineState } from '@xrengine/hyperflux' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { defineState } from '@etherealengine/hyperflux' export const matchesAvatarProps = matches.shape({ avatarURL: matches.string, diff --git a/packages/engine/src/networking/serialization/DataReader.test.ts b/packages/engine/src/networking/serialization/DataReader.test.ts index 97c1313f60..8233ae7957 100644 --- a/packages/engine/src/networking/serialization/DataReader.test.ts +++ b/packages/engine/src/networking/serialization/DataReader.test.ts @@ -2,10 +2,10 @@ import assert, { strictEqual } from 'assert' import { TypedArray } from 'bitecs' import { Group, Quaternion, Vector3 } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { getState } from '@xrengine/hyperflux' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { getState } from '@etherealengine/hyperflux' import { createMockNetwork } from '../../../tests/util/createMockNetwork' import { roundNumberToPlaces } from '../../../tests/util/MathTestUtils' diff --git a/packages/engine/src/networking/serialization/DataReader.ts b/packages/engine/src/networking/serialization/DataReader.ts index 53cf0673ee..c97eb231c0 100644 --- a/packages/engine/src/networking/serialization/DataReader.ts +++ b/packages/engine/src/networking/serialization/DataReader.ts @@ -1,9 +1,9 @@ import { TypedArray } from 'bitecs' import { Quaternion, Vector3 } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { AvatarComponent } from '../../avatar/components/AvatarComponent' import { AvatarLeftArmIKComponent, AvatarRightArmIKComponent } from '../../avatar/components/AvatarIKComponents' diff --git a/packages/engine/src/networking/serialization/DataWriter.test.ts b/packages/engine/src/networking/serialization/DataWriter.test.ts index 786a1c1413..783b9f37c8 100644 --- a/packages/engine/src/networking/serialization/DataWriter.test.ts +++ b/packages/engine/src/networking/serialization/DataWriter.test.ts @@ -1,10 +1,10 @@ import { strictEqual } from 'assert' import { Group, Matrix4, Quaternion, Vector3 } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { getState } from '@xrengine/hyperflux' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { getState } from '@etherealengine/hyperflux' import { createMockNetwork } from '../../../tests/util/createMockNetwork' import { roundNumberToPlaces } from '../../../tests/util/MathTestUtils' diff --git a/packages/engine/src/networking/serialization/DataWriter.ts b/packages/engine/src/networking/serialization/DataWriter.ts index 20fd93ac5d..7a57d99082 100644 --- a/packages/engine/src/networking/serialization/DataWriter.ts +++ b/packages/engine/src/networking/serialization/DataWriter.ts @@ -1,8 +1,8 @@ import { Group } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { AvatarComponent } from '../../avatar/components/AvatarComponent' import { AvatarLeftArmIKComponent, AvatarRightArmIKComponent } from '../../avatar/components/AvatarIKComponents' diff --git a/packages/engine/src/networking/serialization/ViewCursor.test.ts b/packages/engine/src/networking/serialization/ViewCursor.test.ts index f5a24a6574..a95eb0f6f4 100644 --- a/packages/engine/src/networking/serialization/ViewCursor.test.ts +++ b/packages/engine/src/networking/serialization/ViewCursor.test.ts @@ -1,6 +1,6 @@ import assert, { strictEqual } from 'assert' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' import { Entity, UndefinedEntity } from '../../ecs/classes/Entity' import { NetworkObjectComponent } from '../components/NetworkObjectComponent' diff --git a/packages/engine/src/networking/systems/IncomingActionSystem.test.ts b/packages/engine/src/networking/systems/IncomingActionSystem.test.ts index 603df8cd2b..47a6cc49db 100644 --- a/packages/engine/src/networking/systems/IncomingActionSystem.test.ts +++ b/packages/engine/src/networking/systems/IncomingActionSystem.test.ts @@ -1,13 +1,13 @@ import assert, { strictEqual } from 'assert' import matches from 'ts-matches' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { getState } from '@xrengine/hyperflux' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { getState } from '@etherealengine/hyperflux' import { ActionRecipients, addActionReceptor, applyIncomingActions -} from '@xrengine/hyperflux/functions/ActionFunctions' +} from '@etherealengine/hyperflux/functions/ActionFunctions' import { createMockNetwork } from '../../../tests/util/createMockNetwork' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/networking/systems/IncomingActionSystem.ts b/packages/engine/src/networking/systems/IncomingActionSystem.ts index 1cad9ee5fa..fb046f98ac 100644 --- a/packages/engine/src/networking/systems/IncomingActionSystem.ts +++ b/packages/engine/src/networking/systems/IncomingActionSystem.ts @@ -1,4 +1,4 @@ -import { applyIncomingActions } from '@xrengine/hyperflux' +import { applyIncomingActions } from '@etherealengine/hyperflux' import { World } from '../../ecs/classes/World' diff --git a/packages/engine/src/networking/systems/WorldNetworkActionSystem.ts b/packages/engine/src/networking/systems/WorldNetworkActionSystem.ts index 13bf9514b3..73ac6b4324 100644 --- a/packages/engine/src/networking/systems/WorldNetworkActionSystem.ts +++ b/packages/engine/src/networking/systems/WorldNetworkActionSystem.ts @@ -1,4 +1,4 @@ -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { WorldNetworkAction } from '../functions/WorldNetworkAction' import { WorldNetworkActionReceptor } from '../functions/WorldNetworkActionReceptor' diff --git a/packages/engine/src/physics/functions/physicsObjectDebugFunctions.ts b/packages/engine/src/physics/functions/physicsObjectDebugFunctions.ts index 9fa8e1c152..4b8e5be7e1 100644 --- a/packages/engine/src/physics/functions/physicsObjectDebugFunctions.ts +++ b/packages/engine/src/physics/functions/physicsObjectDebugFunctions.ts @@ -8,20 +8,23 @@ import { } from '@dimforge/rapier3d-compat' import { BoxGeometry, Mesh, MeshBasicMaterial, Object3D, SphereGeometry, Vector3 } from 'three' -// import { getColorForBodyType } from '@xrengine/engine/src/debug/systems/DebugRenderer' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { addComponent, getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' -import { WorldNetworkAction } from '@xrengine/engine/src/networking/functions/WorldNetworkAction' -import { CollisionGroups } from '@xrengine/engine/src/physics/enums/CollisionGroups' -import { ColliderDescOptions } from '@xrengine/engine/src/physics/types/PhysicsTypes' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' -import { parseGLTFModel } from '@xrengine/engine/src/scene/functions/loadGLTFModel' -import { createNewEditorNode } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -import { setTransformComponent, TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { dispatchAction } from '@xrengine/hyperflux' +// import { getColorForBodyType } from '@etherealengine/engine/src/debug/systems/DebugRenderer' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { addComponent, getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' +import { WorldNetworkAction } from '@etherealengine/engine/src/networking/functions/WorldNetworkAction' +import { CollisionGroups } from '@etherealengine/engine/src/physics/enums/CollisionGroups' +import { ColliderDescOptions } from '@etherealengine/engine/src/physics/types/PhysicsTypes' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' +import { parseGLTFModel } from '@etherealengine/engine/src/scene/functions/loadGLTFModel' +import { createNewEditorNode } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +import { + setTransformComponent, + TransformComponent +} from '@etherealengine/engine/src/transform/components/TransformComponent' +import { dispatchAction } from '@etherealengine/hyperflux' import { getEngineState } from '../../ecs/classes/EngineState' import { NetworkTopics } from '../../networking/classes/Network' diff --git a/packages/engine/src/physics/systems/PhysicsSystem.ts b/packages/engine/src/physics/systems/PhysicsSystem.ts index 7d3c6df49c..04f0950ac8 100755 --- a/packages/engine/src/physics/systems/PhysicsSystem.ts +++ b/packages/engine/src/physics/systems/PhysicsSystem.ts @@ -2,8 +2,8 @@ import { Not } from 'bitecs' import { useEffect } from 'react' import { Quaternion, Vector3 } from 'three' -import { smootheLerpAlpha } from '@xrengine/common/src/utils/smootheLerpAlpha' -import { createActionQueue, getState, removeActionQueue } from '@xrengine/hyperflux' +import { smootheLerpAlpha } from '@etherealengine/common/src/utils/smootheLerpAlpha' +import { createActionQueue, getState, removeActionQueue } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { EngineActions, EngineState } from '../../ecs/classes/EngineState' diff --git a/packages/engine/src/renderer/RendererState.ts b/packages/engine/src/renderer/RendererState.ts index b4b88606ac..2d6e8f2c0a 100644 --- a/packages/engine/src/renderer/RendererState.ts +++ b/packages/engine/src/renderer/RendererState.ts @@ -1,4 +1,4 @@ -import { defineState, syncStateWithLocalStorage } from '@xrengine/hyperflux' +import { defineState, syncStateWithLocalStorage } from '@etherealengine/hyperflux' import { isMobile } from '../common/functions/isMobile' import { RenderModes, RenderModesType } from './constants/RenderModes' diff --git a/packages/engine/src/renderer/THREE.WebGL.ts b/packages/engine/src/renderer/THREE.WebGL.ts index 088e938809..30e0ca785f 100644 --- a/packages/engine/src/renderer/THREE.WebGL.ts +++ b/packages/engine/src/renderer/THREE.WebGL.ts @@ -1,4 +1,4 @@ -import { defineAction, dispatchAction } from '@xrengine/hyperflux' +import { defineAction, dispatchAction } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/renderer/WebGLRendererSystem.ts b/packages/engine/src/renderer/WebGLRendererSystem.ts index 0ec5810436..fab4f0ec34 100644 --- a/packages/engine/src/renderer/WebGLRendererSystem.ts +++ b/packages/engine/src/renderer/WebGLRendererSystem.ts @@ -38,7 +38,7 @@ import { startReactor, State, useHookstate -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { CSM } from '../assets/csm/CSM' import { ExponentialMovingAverage } from '../common/classes/ExponentialAverageCurve' diff --git a/packages/engine/src/renderer/functions/RenderSettingsFunction.ts b/packages/engine/src/renderer/functions/RenderSettingsFunction.ts index a669df1512..9be0514aef 100644 --- a/packages/engine/src/renderer/functions/RenderSettingsFunction.ts +++ b/packages/engine/src/renderer/functions/RenderSettingsFunction.ts @@ -1,6 +1,6 @@ import { DirectionalLight } from 'three' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { getState, useHookstate } from '@etherealengine/hyperflux' import { iOS } from '../../common/functions/isMobile' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/renderer/functions/changeRenderMode.ts b/packages/engine/src/renderer/functions/changeRenderMode.ts index fb8d1b76f1..6fe8a1f553 100644 --- a/packages/engine/src/renderer/functions/changeRenderMode.ts +++ b/packages/engine/src/renderer/functions/changeRenderMode.ts @@ -1,8 +1,8 @@ import { RenderPass } from 'postprocessing' import { Light, MeshBasicMaterial, MeshNormalMaterial } from 'three' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getState } from '@xrengine/hyperflux' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getState } from '@etherealengine/hyperflux' import { RenderModes } from '../constants/RenderModes' import { RendererState } from '../RendererState' diff --git a/packages/engine/src/renderer/functions/configureEffectComposer.ts b/packages/engine/src/renderer/functions/configureEffectComposer.ts index cfc761b4c0..3277e14464 100644 --- a/packages/engine/src/renderer/functions/configureEffectComposer.ts +++ b/packages/engine/src/renderer/functions/configureEffectComposer.ts @@ -1,7 +1,7 @@ import { BlendFunction, DepthDownsamplingPass, EffectPass, NormalPass, RenderPass, TextureEffect } from 'postprocessing' import { NearestFilter, PerspectiveCamera, RGBAFormat, WebGLRenderTarget } from 'three' -import { NO_PROXY } from '@xrengine/hyperflux' +import { NO_PROXY } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { EffectMap, EffectPropsSchema, Effects } from '../../scene/constants/PostProcessing' diff --git a/packages/engine/src/renderer/materials/MaterialLibrary.ts b/packages/engine/src/renderer/materials/MaterialLibrary.ts index 920055f7fb..73ef2a1d46 100644 --- a/packages/engine/src/renderer/materials/MaterialLibrary.ts +++ b/packages/engine/src/renderer/materials/MaterialLibrary.ts @@ -1,7 +1,14 @@ import { Material } from 'three' import matches, { Validator } from 'ts-matches' -import { defineAction, defineState, dispatchAction, getState, StateDefinition, useState } from '@xrengine/hyperflux' +import { + defineAction, + defineState, + dispatchAction, + getState, + StateDefinition, + useState +} from '@etherealengine/hyperflux' import { MaterialComponentType } from './components/MaterialComponent' import { MaterialPrototypeComponentType } from './components/MaterialPrototypeComponent' diff --git a/packages/engine/src/renderer/materials/functions/MaterialFunctions.ts b/packages/engine/src/renderer/materials/functions/MaterialFunctions.ts index 12dc5828d6..26ba33d4b4 100644 --- a/packages/engine/src/renderer/materials/functions/MaterialFunctions.ts +++ b/packages/engine/src/renderer/materials/functions/MaterialFunctions.ts @@ -1,6 +1,6 @@ import { Mesh, Object3D } from 'three' -import multiLogger from '@xrengine/common/src/logger' +import multiLogger from '@etherealengine/common/src/logger' import { Engine } from '../../../ecs/classes/Engine' import iterateObject3D from '../../../scene/util/iterateObject3D' diff --git a/packages/engine/src/renderer/materials/functions/MaterialLibraryFunctions.ts b/packages/engine/src/renderer/materials/functions/MaterialLibraryFunctions.ts index 7eee625a47..247303d3c4 100644 --- a/packages/engine/src/renderer/materials/functions/MaterialLibraryFunctions.ts +++ b/packages/engine/src/renderer/materials/functions/MaterialLibraryFunctions.ts @@ -1,6 +1,6 @@ import { Color, Material, Mesh, Texture } from 'three' -import { dispatchAction, getState, none } from '@xrengine/hyperflux' +import { dispatchAction, getState, none } from '@etherealengine/hyperflux' import { stringHash } from '../../../common/functions/MathFunctions' import { Engine } from '../../../ecs/classes/Engine' diff --git a/packages/engine/src/renderer/materials/systems/MaterialLibrarySystem.ts b/packages/engine/src/renderer/materials/systems/MaterialLibrarySystem.ts index d56d3957b5..ba5d72daba 100644 --- a/packages/engine/src/renderer/materials/systems/MaterialLibrarySystem.ts +++ b/packages/engine/src/renderer/materials/systems/MaterialLibrarySystem.ts @@ -1,4 +1,4 @@ -import { createActionQueue } from '@xrengine/hyperflux' +import { createActionQueue } from '@etherealengine/hyperflux' import { World } from '../../../ecs/classes/World' import { defineQuery, removeQuery } from '../../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/classes/Spline.ts b/packages/engine/src/scene/classes/Spline.ts index ea7cf5e926..2441d4886d 100644 --- a/packages/engine/src/scene/classes/Spline.ts +++ b/packages/engine/src/scene/classes/Spline.ts @@ -1,6 +1,6 @@ import { BufferAttribute, BufferGeometry, CatmullRomCurve3, Line, LineBasicMaterial, Object3D, Vector3 } from 'three' -import { removeElementFromArray } from '@xrengine/common/src/utils/removeElementFromArray' +import { removeElementFromArray } from '@etherealengine/common/src/utils/removeElementFromArray' import { ObjectLayers } from '../constants/ObjectLayers' import SplineHelper from './SplineHelper' diff --git a/packages/engine/src/scene/components/DirectionalLightComponent.ts b/packages/engine/src/scene/components/DirectionalLightComponent.ts index 84be93019b..d1507af8ed 100644 --- a/packages/engine/src/scene/components/DirectionalLightComponent.ts +++ b/packages/engine/src/scene/components/DirectionalLightComponent.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { Color, DirectionalLight, IcosahedronGeometry, Mesh, MeshBasicMaterial, Object3D, Vector2 } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { diff --git a/packages/engine/src/scene/components/EnvMapBakeComponent.ts b/packages/engine/src/scene/components/EnvMapBakeComponent.ts index 8db38f86c0..ba9b7fab9d 100644 --- a/packages/engine/src/scene/components/EnvMapBakeComponent.ts +++ b/packages/engine/src/scene/components/EnvMapBakeComponent.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { BoxGeometry, BoxHelper, Mesh, MeshPhysicalMaterial, Object3D, SphereGeometry, Vector3 } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { diff --git a/packages/engine/src/scene/components/GroupComponent.tsx b/packages/engine/src/scene/components/GroupComponent.tsx index ad4f543495..fc1133ff39 100644 --- a/packages/engine/src/scene/components/GroupComponent.tsx +++ b/packages/engine/src/scene/components/GroupComponent.tsx @@ -2,7 +2,7 @@ import * as bitECS from 'bitecs' import React from 'react' import { Camera, Material, Mesh, Object3D } from 'three' -import { none } from '@xrengine/hyperflux' +import { none } from '@etherealengine/hyperflux' import { proxifyQuaternionWithDirty, proxifyVector3WithDirty } from '../../common/proxies/createThreejsProxy' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/scene/components/ImageComponent.ts b/packages/engine/src/scene/components/ImageComponent.ts index c5888e4689..0bc00c1c53 100644 --- a/packages/engine/src/scene/components/ImageComponent.ts +++ b/packages/engine/src/scene/components/ImageComponent.ts @@ -11,7 +11,7 @@ import { } from 'three' import { LinearMipmapLinearFilter, sRGBEncoding, Texture } from 'three' -import { useHookstate } from '@xrengine/hyperflux' +import { useHookstate } from '@etherealengine/hyperflux' import { AssetLoader } from '../../assets/classes/AssetLoader' import { AssetClass } from '../../assets/enum/AssetClass' diff --git a/packages/engine/src/scene/components/InstancingComponent.ts b/packages/engine/src/scene/components/InstancingComponent.ts index 90d7417e92..5f563ff7a3 100644 --- a/packages/engine/src/scene/components/InstancingComponent.ts +++ b/packages/engine/src/scene/components/InstancingComponent.ts @@ -1,7 +1,7 @@ import { BufferGeometry, Color, Material, MathUtils, Mesh, Texture } from 'three' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { State } from '@xrengine/hyperflux' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { State } from '@etherealengine/hyperflux' import { createMappedComponent, defineComponent } from '../../ecs/functions/ComponentFunctions' import { diff --git a/packages/engine/src/scene/components/LoadVolumeComponent.ts b/packages/engine/src/scene/components/LoadVolumeComponent.ts index ed95d1783b..700ca48dda 100644 --- a/packages/engine/src/scene/components/LoadVolumeComponent.ts +++ b/packages/engine/src/scene/components/LoadVolumeComponent.ts @@ -1,13 +1,13 @@ import matches, { Validator } from 'ts-matches' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { EntityJson } from '@xrengine/common/src/interfaces/SceneInterface' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { EntityJson } from '@etherealengine/common/src/interfaces/SceneInterface' import { defineComponent, getComponent, hasComponent, removeComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' import { Engine } from '../../ecs/classes/Engine' import { EntityTreeComponent, removeEntityNodeRecursively } from '../../ecs/functions/EntityTree' diff --git a/packages/engine/src/scene/components/MediaComponent.ts b/packages/engine/src/scene/components/MediaComponent.ts index 9d1551e1c9..50f7b251f0 100644 --- a/packages/engine/src/scene/components/MediaComponent.ts +++ b/packages/engine/src/scene/components/MediaComponent.ts @@ -2,7 +2,7 @@ import Hls from 'hls.js' import { startTransition, useEffect } from 'react' import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { AssetLoader } from '../../assets/classes/AssetLoader' import { removePannerNode } from '../../audio/systems/PositionalAudioSystem' diff --git a/packages/engine/src/scene/components/MountPointComponent.ts b/packages/engine/src/scene/components/MountPointComponent.ts index caea94ae5c..8dc4e4a72b 100755 --- a/packages/engine/src/scene/components/MountPointComponent.ts +++ b/packages/engine/src/scene/components/MountPointComponent.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { ArrowHelper, Vector3 } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { defineComponent, hasComponent, useComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/components/NameComponent.ts b/packages/engine/src/scene/components/NameComponent.ts index 7fcdb06909..29949e2aec 100755 --- a/packages/engine/src/scene/components/NameComponent.ts +++ b/packages/engine/src/scene/components/NameComponent.ts @@ -1,4 +1,4 @@ -import { hookstate, none } from '@xrengine/hyperflux' +import { hookstate, none } from '@etherealengine/hyperflux' import { Entity } from '../../ecs/classes/Entity' import { defineComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/components/ParticleBehaviorComponent.ts b/packages/engine/src/scene/components/ParticleBehaviorComponent.ts index 9a87ac8dd3..d620550fdf 100644 --- a/packages/engine/src/scene/components/ParticleBehaviorComponent.ts +++ b/packages/engine/src/scene/components/ParticleBehaviorComponent.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { Behavior } from 'three.quarks' -import { NO_PROXY } from '@xrengine/hyperflux' +import { NO_PROXY } from '@etherealengine/hyperflux' import { defineComponent, useComponent } from '../../ecs/functions/ComponentFunctions' import { EntityReactorProps } from '../../ecs/functions/EntityFunctions' diff --git a/packages/engine/src/scene/components/ParticleSystemComponent.ts b/packages/engine/src/scene/components/ParticleSystemComponent.ts index b7bb978ffa..d2b1cebbed 100644 --- a/packages/engine/src/scene/components/ParticleSystemComponent.ts +++ b/packages/engine/src/scene/components/ParticleSystemComponent.ts @@ -3,7 +3,7 @@ import { AdditiveBlending, BufferGeometry, Texture } from 'three' import { Behavior, BehaviorFromJSON, ParticleSystem, ParticleSystemJSONParameters, RenderMode } from 'three.quarks' import matches from 'ts-matches' -import { NO_PROXY, none } from '@xrengine/hyperflux' +import { NO_PROXY, none } from '@etherealengine/hyperflux' import { AssetLoader } from '../../assets/classes/AssetLoader' import { AssetClass } from '../../assets/enum/AssetClass' diff --git a/packages/engine/src/scene/components/PointLightComponent.ts b/packages/engine/src/scene/components/PointLightComponent.ts index c5d8461e88..efbb391c81 100644 --- a/packages/engine/src/scene/components/PointLightComponent.ts +++ b/packages/engine/src/scene/components/PointLightComponent.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { Color, IcosahedronGeometry, Mesh, MeshBasicMaterial, Object3D, PointLight } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { defineComponent, hasComponent, useComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/components/PortalComponent.ts b/packages/engine/src/scene/components/PortalComponent.ts index d915be6d01..a35521fbd4 100644 --- a/packages/engine/src/scene/components/PortalComponent.ts +++ b/packages/engine/src/scene/components/PortalComponent.ts @@ -12,7 +12,7 @@ import { Vector3 } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { diff --git a/packages/engine/src/scene/components/ScenePreviewCamera.ts b/packages/engine/src/scene/components/ScenePreviewCamera.ts index 152b5cf6a9..27f3704e84 100755 --- a/packages/engine/src/scene/components/ScenePreviewCamera.ts +++ b/packages/engine/src/scene/components/ScenePreviewCamera.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { CameraHelper, PerspectiveCamera } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { defineComponent, getComponent, hasComponent, useComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/components/SpawnPointComponent.ts b/packages/engine/src/scene/components/SpawnPointComponent.ts index b5571e4436..b0e3d8bed5 100755 --- a/packages/engine/src/scene/components/SpawnPointComponent.ts +++ b/packages/engine/src/scene/components/SpawnPointComponent.ts @@ -1,8 +1,8 @@ import { useEffect } from 'react' import { BoxGeometry, BoxHelper, Mesh, Scene } from 'three' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { AssetLoader } from '../../assets/classes/AssetLoader' import { matches } from '../../common/functions/MatchesUtils' diff --git a/packages/engine/src/scene/components/SpotLightComponent.ts b/packages/engine/src/scene/components/SpotLightComponent.ts index 1e73b584b7..b159dd48ad 100644 --- a/packages/engine/src/scene/components/SpotLightComponent.ts +++ b/packages/engine/src/scene/components/SpotLightComponent.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { Color, ConeGeometry, DoubleSide, Mesh, MeshBasicMaterial, Object3D, SpotLight, TorusGeometry } from 'three' -import { getState, none, useHookstate } from '@xrengine/hyperflux' +import { getState, none, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../../common/functions/MatchesUtils' import { defineComponent, hasComponent, useComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/components/UUIDComponent.ts b/packages/engine/src/scene/components/UUIDComponent.ts index 7d838635a7..b3622ffc72 100644 --- a/packages/engine/src/scene/components/UUIDComponent.ts +++ b/packages/engine/src/scene/components/UUIDComponent.ts @@ -1,5 +1,5 @@ -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { createState, none } from '@xrengine/hyperflux' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { createState, none } from '@etherealengine/hyperflux' import { Entity } from '../../ecs/classes/Entity' import { defineComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/components/VolumetricComponent.ts b/packages/engine/src/scene/components/VolumetricComponent.ts index 7e057b0d92..fc18dfdf83 100755 --- a/packages/engine/src/scene/components/VolumetricComponent.ts +++ b/packages/engine/src/scene/components/VolumetricComponent.ts @@ -1,4 +1,4 @@ -import { StateMethodsDestroy } from '@xrengine/hyperflux/functions/StateFunctions' +import { StateMethodsDestroy } from '@etherealengine/hyperflux/functions/StateFunctions' import { defineComponent } from '../../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/scene/functions/ErrorFunctions.ts b/packages/engine/src/scene/functions/ErrorFunctions.ts index a41128013d..51daa06c43 100644 --- a/packages/engine/src/scene/functions/ErrorFunctions.ts +++ b/packages/engine/src/scene/functions/ErrorFunctions.ts @@ -1,6 +1,6 @@ import { isEmpty } from 'lodash' -import { none } from '@xrengine/hyperflux' +import { none } from '@etherealengine/hyperflux' import { Entity } from '../../ecs/classes/Entity' import { diff --git a/packages/engine/src/scene/functions/GLTFConversion.ts b/packages/engine/src/scene/functions/GLTFConversion.ts index 95cbe53b4d..20b7b2106f 100644 --- a/packages/engine/src/scene/functions/GLTFConversion.ts +++ b/packages/engine/src/scene/functions/GLTFConversion.ts @@ -1,18 +1,18 @@ import { Color, MathUtils, Object3D } from 'three' -import config from '@xrengine/common/src/config' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { ComponentJson, EntityJson, SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { World } from '@xrengine/engine/src/ecs/classes/World' +import config from '@etherealengine/common/src/config' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { ComponentJson, EntityJson, SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { getAllComponents, getComponent, getComponentState, serializeComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { getState } from '@xrengine/hyperflux' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { getState } from '@etherealengine/hyperflux' import { EntityTreeComponent, iterateEntityNode } from '../../ecs/functions/EntityTree' import { getSceneMetadataChanges } from '../../ecs/functions/getSceneMetadataChanges' diff --git a/packages/engine/src/scene/functions/getUniqueName.ts b/packages/engine/src/scene/functions/getUniqueName.ts index 3895442cc4..8516c7cfce 100755 --- a/packages/engine/src/scene/functions/getUniqueName.ts +++ b/packages/engine/src/scene/functions/getUniqueName.ts @@ -1,6 +1,6 @@ -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' -import { getOptionalComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { NameComponent } from '@xrengine/engine/src/scene/components/NameComponent' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' +import { getOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent' const namePattern = new RegExp('(.*) \\d+$') diff --git a/packages/engine/src/scene/functions/loadGLTFModel.ts b/packages/engine/src/scene/functions/loadGLTFModel.ts index bcd8cd2768..d12cb882b4 100644 --- a/packages/engine/src/scene/functions/loadGLTFModel.ts +++ b/packages/engine/src/scene/functions/loadGLTFModel.ts @@ -1,6 +1,6 @@ import { AnimationMixer, BufferGeometry, Mesh, Object3D } from 'three' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' import { AnimationComponent } from '../../avatar/components/AnimationComponent' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/scene/functions/loaders/InstancingFunctions.ts b/packages/engine/src/scene/functions/loaders/InstancingFunctions.ts index de0b4c9cd8..eeb838372b 100644 --- a/packages/engine/src/scene/functions/loaders/InstancingFunctions.ts +++ b/packages/engine/src/scene/functions/loaders/InstancingFunctions.ts @@ -23,8 +23,8 @@ import { } from 'three' import matches from 'ts-matches' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { defineAction, dispatchAction, State } from '@xrengine/hyperflux' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { defineAction, dispatchAction, State } from '@etherealengine/hyperflux' import { AssetLoader } from '../../../assets/classes/AssetLoader' import { DependencyTree } from '../../../assets/classes/DependencyTree' diff --git a/packages/engine/src/scene/functions/loaders/ModelFunctions.ts b/packages/engine/src/scene/functions/loaders/ModelFunctions.ts index efaa0b1808..8701a3ca81 100644 --- a/packages/engine/src/scene/functions/loaders/ModelFunctions.ts +++ b/packages/engine/src/scene/functions/loaders/ModelFunctions.ts @@ -1,4 +1,4 @@ -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { ComponentDeserializeFunction, ComponentSerializeFunction } from '../../../common/constants/PrefabFunctionType' import { EngineState } from '../../../ecs/classes/EngineState' diff --git a/packages/engine/src/scene/functions/loaders/PortalFunctions.ts b/packages/engine/src/scene/functions/loaders/PortalFunctions.ts index 03764ab601..8a474879e4 100644 --- a/packages/engine/src/scene/functions/loaders/PortalFunctions.ts +++ b/packages/engine/src/scene/functions/loaders/PortalFunctions.ts @@ -1,4 +1,4 @@ -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { AvatarStates } from '../../../avatar/animation/Util' import { AvatarControllerComponent } from '../../../avatar/components/AvatarControllerComponent' diff --git a/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.test.ts b/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.test.ts index 40344523d7..994a3eeb86 100644 --- a/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.test.ts +++ b/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.test.ts @@ -4,27 +4,27 @@ import fs from 'fs' import path from 'path' import Sinon from 'sinon' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import { addComponent, getAllComponentsOfType, getComponent, hasComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { createEntity, removeEntity } from '@xrengine/engine/src/ecs/functions/EntityFunctions' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { createEntity, removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' import { addEntityNodeChild, destroyEntityTree, EntityTreeComponent -} from '@xrengine/engine/src/ecs/functions/EntityTree' -import { createEngine, setupEngineActionSystems } from '@xrengine/engine/src/initializeEngine' +} from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { createEngine, setupEngineActionSystems } from '@etherealengine/engine/src/initializeEngine' -import '@xrengine/engine/src/patchEngineNode' +import '@etherealengine/engine/src/patchEngineNode' -import { ModelComponent } from '@xrengine/engine/src/scene/components/ModelComponent' -import { LoadState, PrefabComponent } from '@xrengine/engine/src/scene/components/PrefabComponent' -import { loadPrefab, unloadPrefab } from '@xrengine/engine/src/scene/functions/loaders/PrefabComponentFunctions' +import { ModelComponent } from '@etherealengine/engine/src/scene/components/ModelComponent' +import { LoadState, PrefabComponent } from '@etherealengine/engine/src/scene/components/PrefabComponent' +import { loadPrefab, unloadPrefab } from '@etherealengine/engine/src/scene/functions/loaders/PrefabComponentFunctions' import { AssetLoader } from '../../../assets/classes/AssetLoader' import { XRELoader } from '../../../assets/classes/XRELoader' diff --git a/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.ts b/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.ts index 5742b13b9a..556a1b52aa 100644 --- a/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.ts +++ b/packages/engine/src/scene/functions/loaders/PrefabComponentFunctions.ts @@ -1,16 +1,16 @@ -import { AssetLoader } from '@xrengine/engine/src/assets/classes/AssetLoader' -import { AssetType } from '@xrengine/engine/src/assets/enum/AssetType' -import { ComponentDeserializeFunction } from '@xrengine/engine/src/common/constants/PrefabFunctionType' -import { Entity } from '@xrengine/engine/src/ecs/classes/Entity' +import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoader' +import { AssetType } from '@etherealengine/engine/src/assets/enum/AssetType' +import { ComponentDeserializeFunction } from '@etherealengine/engine/src/common/constants/PrefabFunctionType' +import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity' import { ComponentType, getComponent, getComponentState, hasComponent, setComponent -} from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { iterateEntityNode } from '@xrengine/engine/src/ecs/functions/EntityTree' -import { LoadState, PrefabComponent } from '@xrengine/engine/src/scene/components/PrefabComponent' +} from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { iterateEntityNode } from '@etherealengine/engine/src/ecs/functions/EntityTree' +import { LoadState, PrefabComponent } from '@etherealengine/engine/src/scene/components/PrefabComponent' import { removeEntity } from '../../../ecs/functions/EntityFunctions' diff --git a/packages/engine/src/scene/functions/loaders/VolumetricFunctions.ts b/packages/engine/src/scene/functions/loaders/VolumetricFunctions.ts index fdfdb42530..f9be42ea7c 100644 --- a/packages/engine/src/scene/functions/loaders/VolumetricFunctions.ts +++ b/packages/engine/src/scene/functions/loaders/VolumetricFunctions.ts @@ -1,11 +1,11 @@ -import type VolumetricPlayer from '@xrfoundation/volumetric/player' import { Box3, Material, Mesh, Object3D } from 'three' -import { createWorkerFromCrossOriginURL } from '@xrengine/common/src/utils/createWorkerFromCrossOriginURL' -import { AvatarDissolveComponent } from '@xrengine/engine/src/avatar/components/AvatarDissolveComponent' -import { AvatarEffectComponent, MaterialMap } from '@xrengine/engine/src/avatar/components/AvatarEffectComponent' -import { DissolveEffect } from '@xrengine/engine/src/avatar/DissolveEffect' -import { getState } from '@xrengine/hyperflux' +import { createWorkerFromCrossOriginURL } from '@etherealengine/common/src/utils/createWorkerFromCrossOriginURL' +import { AvatarDissolveComponent } from '@etherealengine/engine/src/avatar/components/AvatarDissolveComponent' +import { AvatarEffectComponent, MaterialMap } from '@etherealengine/engine/src/avatar/components/AvatarEffectComponent' +import { DissolveEffect } from '@etherealengine/engine/src/avatar/DissolveEffect' +import { getState } from '@etherealengine/hyperflux' +import type VolumetricPlayer from '@etherealengine/volumetric/player' import { isClient } from '../../../common/functions/isClient' import { iOS } from '../../../common/functions/isMobile' @@ -27,11 +27,11 @@ import { MediaComponent, MediaElementComponent } from '../../components/MediaCom import { VolumetricComponent } from '../../components/VolumetricComponent' import { PlayMode } from '../../constants/PlayMode' -let VolumetricPlayerPromise = null! as Promise +let VolumetricPlayerPromise = null! as Promise if (isClient) { // todo: add top-level await here to ensure it's loaded when component is created - VolumetricPlayerPromise = import('@xrfoundation/volumetric/player').then((module) => module.default) + VolumetricPlayerPromise = import('@etherealengine/volumetric/player').then((module) => module.default) } const Volumetric = new WeakMap< diff --git a/packages/engine/src/scene/functions/serializeWorld.ts b/packages/engine/src/scene/functions/serializeWorld.ts index b72e16759f..6f5b92db1c 100644 --- a/packages/engine/src/scene/functions/serializeWorld.ts +++ b/packages/engine/src/scene/functions/serializeWorld.ts @@ -1,7 +1,7 @@ import { MathUtils } from 'three' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { ComponentJson, EntityJson } from '@xrengine/common/src/interfaces/SceneInterface' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { ComponentJson, EntityJson } from '@etherealengine/common/src/interfaces/SceneInterface' import { Engine } from '../../ecs/classes/Engine' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/scene/systems/FogSystem.ts b/packages/engine/src/scene/systems/FogSystem.ts index 039e9dacf8..eb87c6a1da 100644 --- a/packages/engine/src/scene/systems/FogSystem.ts +++ b/packages/engine/src/scene/systems/FogSystem.ts @@ -3,7 +3,7 @@ import _ from 'lodash' import { useEffect } from 'react' import { Fog, FogExp2, Mesh, MeshStandardMaterial } from 'three' -import { hookstate, startReactor, State, useHookstate } from '@xrengine/hyperflux' +import { hookstate, startReactor, State, useHookstate } from '@etherealengine/hyperflux' import { OBCType } from '../../common/constants/OBCTypes' import { addOBCPlugin, PluginType, removeOBCPlugin } from '../../common/functions/OnBeforeCompilePlugin' diff --git a/packages/engine/src/scene/systems/InstancingSystem.ts b/packages/engine/src/scene/systems/InstancingSystem.ts index 3d0eb396d8..a3f026562f 100644 --- a/packages/engine/src/scene/systems/InstancingSystem.ts +++ b/packages/engine/src/scene/systems/InstancingSystem.ts @@ -1,4 +1,4 @@ -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { EngineActions, getEngineState } from '../../ecs/classes/EngineState' import { World } from '../../ecs/classes/World' diff --git a/packages/engine/src/scene/systems/LoadVolumeSystem.ts b/packages/engine/src/scene/systems/LoadVolumeSystem.ts index e1417a1a7c..3dc20d48fc 100644 --- a/packages/engine/src/scene/systems/LoadVolumeSystem.ts +++ b/packages/engine/src/scene/systems/LoadVolumeSystem.ts @@ -1,4 +1,4 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' +import { World } from '@etherealengine/engine/src/ecs/classes/World' import { LoadVolumeComponent, SCENE_COMPONENT_LOAD_VOLUME } from '../components/LoadVolumeComponent' import { ScenePrefabs } from './SceneObjectUpdateSystem' diff --git a/packages/engine/src/scene/systems/ParticleSystemSystem.ts b/packages/engine/src/scene/systems/ParticleSystemSystem.ts index acae13bd7d..aa99b2254d 100755 --- a/packages/engine/src/scene/systems/ParticleSystemSystem.ts +++ b/packages/engine/src/scene/systems/ParticleSystemSystem.ts @@ -1,6 +1,6 @@ import { BatchedParticleRenderer } from 'three.quarks' -import { matches, Validator } from '@xrengine/engine/src/common/functions/MatchesUtils' +import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils' import { createActionQueue, defineAction, @@ -9,7 +9,7 @@ import { getState, NO_PROXY, removeActionQueue -} from '@xrengine/hyperflux' +} from '@etherealengine/hyperflux' import { EngineActions } from '../../ecs/classes/EngineState' import { Entity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/scene/systems/PortalSystem.ts b/packages/engine/src/scene/systems/PortalSystem.ts index 28281880d5..6a471dc2db 100644 --- a/packages/engine/src/scene/systems/PortalSystem.ts +++ b/packages/engine/src/scene/systems/PortalSystem.ts @@ -1,4 +1,4 @@ -import { createActionQueue, getState, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, getState, removeActionQueue } from '@etherealengine/hyperflux' import { Engine } from '../../ecs/classes/Engine' import { EngineActions, EngineState } from '../../ecs/classes/EngineState' diff --git a/packages/engine/src/scene/systems/SceneLoadingSystem.ts b/packages/engine/src/scene/systems/SceneLoadingSystem.ts index f60d2385eb..3af9f24aa3 100755 --- a/packages/engine/src/scene/systems/SceneLoadingSystem.ts +++ b/packages/engine/src/scene/systems/SceneLoadingSystem.ts @@ -1,12 +1,12 @@ import { cloneDeep, merge } from 'lodash' import { MathUtils } from 'three' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { ComponentJson, EntityJson, SceneData, SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import logger from '@xrengine/common/src/logger' -import { setLocalTransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { dispatchAction, getState, NO_PROXY } from '@xrengine/hyperflux' -import { getSystemsFromSceneData } from '@xrengine/projects/loadSystemInjection' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { ComponentJson, EntityJson, SceneData, SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import logger from '@etherealengine/common/src/logger' +import { setLocalTransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { dispatchAction, getState, NO_PROXY } from '@etherealengine/hyperflux' +import { getSystemsFromSceneData } from '@etherealengine/projects/loadSystemInjection' import { Engine } from '../../ecs/classes/Engine' import { EngineActions, EngineState } from '../../ecs/classes/EngineState' diff --git a/packages/engine/src/scene/systems/SceneObjectSystem.tsx b/packages/engine/src/scene/systems/SceneObjectSystem.tsx index d55f1c2b36..c8fd9f85fb 100644 --- a/packages/engine/src/scene/systems/SceneObjectSystem.tsx +++ b/packages/engine/src/scene/systems/SceneObjectSystem.tsx @@ -11,7 +11,7 @@ import { MeshStandardMaterial } from 'three' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { getState, useHookstate } from '@etherealengine/hyperflux' import { loadDRACODecoder } from '../../assets/loaders/gltf/NodeDracoLoader' import { isNode } from '../../common/functions/getEnvironment' diff --git a/packages/engine/src/scene/systems/SceneObjectUpdateSystem.ts b/packages/engine/src/scene/systems/SceneObjectUpdateSystem.ts index 683bac837f..580e2ab24a 100644 --- a/packages/engine/src/scene/systems/SceneObjectUpdateSystem.ts +++ b/packages/engine/src/scene/systems/SceneObjectUpdateSystem.ts @@ -1,8 +1,8 @@ import { Not } from 'bitecs' import { Color } from 'three' -import { ComponentJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { ComponentJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { LoopAnimationComponent, diff --git a/packages/engine/src/scene/systems/ShadowSystem.ts b/packages/engine/src/scene/systems/ShadowSystem.ts index ebe32898d1..a4c77da682 100644 --- a/packages/engine/src/scene/systems/ShadowSystem.ts +++ b/packages/engine/src/scene/systems/ShadowSystem.ts @@ -20,8 +20,8 @@ import { Vector3 } from 'three' -import config from '@xrengine/common/src/config' -import { getState, hookstate, startReactor, useHookstate } from '@xrengine/hyperflux' +import config from '@etherealengine/common/src/config' +import { getState, hookstate, startReactor, useHookstate } from '@etherealengine/hyperflux' import { AssetLoader } from '../../assets/classes/AssetLoader' import { CSM } from '../../assets/csm/CSM' diff --git a/packages/engine/src/transform/components/ComputedTransformComponent.ts b/packages/engine/src/transform/components/ComputedTransformComponent.ts index f22c252bda..ca7773c33e 100644 --- a/packages/engine/src/transform/components/ComputedTransformComponent.ts +++ b/packages/engine/src/transform/components/ComputedTransformComponent.ts @@ -1,4 +1,4 @@ -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { EngineState } from '../../ecs/classes/EngineState' import { Entity, UndefinedEntity } from '../../ecs/classes/Entity' diff --git a/packages/engine/src/transform/systems/TransformSystem.ts b/packages/engine/src/transform/systems/TransformSystem.ts index 0c8aab47f2..534d4d58d9 100755 --- a/packages/engine/src/transform/systems/TransformSystem.ts +++ b/packages/engine/src/transform/systems/TransformSystem.ts @@ -1,8 +1,8 @@ import { Not } from 'bitecs' import { Camera, Frustum, Matrix4, Mesh, Skeleton, SkinnedMesh, Vector3 } from 'three' -import { insertionSort } from '@xrengine/common/src/utils/insertionSort' -import { createActionQueue, getState, removeActionQueue } from '@xrengine/hyperflux' +import { insertionSort } from '@etherealengine/common/src/utils/insertionSort' +import { createActionQueue, getState, removeActionQueue } from '@etherealengine/hyperflux' import { V_000 } from '../../common/constants/MathConstants' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/transform/updateWorldOrigin.ts b/packages/engine/src/transform/updateWorldOrigin.ts index 498e1a91cf..954ef20585 100644 --- a/packages/engine/src/transform/updateWorldOrigin.ts +++ b/packages/engine/src/transform/updateWorldOrigin.ts @@ -1,4 +1,4 @@ -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' import { getComponent } from '../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/xr/8thwall/XR8.ts b/packages/engine/src/xr/8thwall/XR8.ts index 4f346d092d..032a62e65a 100644 --- a/packages/engine/src/xr/8thwall/XR8.ts +++ b/packages/engine/src/xr/8thwall/XR8.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import config from '@xrengine/common/src/config' -import { dispatchAction, getState, startReactor } from '@xrengine/hyperflux' +import config from '@etherealengine/common/src/config' +import { dispatchAction, getState, startReactor } from '@etherealengine/hyperflux' import { isMobile } from '../../common/functions/isMobile' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/xr/8thwall/XR8Pipeline.ts b/packages/engine/src/xr/8thwall/XR8Pipeline.ts index c7217d8be8..7651934244 100644 --- a/packages/engine/src/xr/8thwall/XR8Pipeline.ts +++ b/packages/engine/src/xr/8thwall/XR8Pipeline.ts @@ -1,6 +1,6 @@ import { Quaternion, Vector3 } from 'three' -import { dispatchAction } from '@xrengine/hyperflux' +import { dispatchAction } from '@etherealengine/hyperflux' import { World } from '../../ecs/classes/World' import { PersistentAnchorActions } from '../XRAnchorComponents' diff --git a/packages/engine/src/xr/8thwall/XR8WebXRProxy.ts b/packages/engine/src/xr/8thwall/XR8WebXRProxy.ts index aa73773521..946c3f56c2 100644 --- a/packages/engine/src/xr/8thwall/XR8WebXRProxy.ts +++ b/packages/engine/src/xr/8thwall/XR8WebXRProxy.ts @@ -1,6 +1,6 @@ import { EventDispatcher, Matrix4, PerspectiveCamera, Quaternion, Vector3 } from 'three' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { V_111 } from '../../common/constants/MathConstants' import { Engine } from '../../ecs/classes/Engine' diff --git a/packages/engine/src/xr/VPSSystem.ts b/packages/engine/src/xr/VPSSystem.ts index 03db3951bc..933a4dfca4 100644 --- a/packages/engine/src/xr/VPSSystem.ts +++ b/packages/engine/src/xr/VPSSystem.ts @@ -1,4 +1,4 @@ -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { World } from '../ecs/classes/World' import { defineQuery, getComponent, getComponentState, removeQuery } from '../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/xr/WebXRManager.ts b/packages/engine/src/xr/WebXRManager.ts index e0efb8cef5..eba7cfce4d 100644 --- a/packages/engine/src/xr/WebXRManager.ts +++ b/packages/engine/src/xr/WebXRManager.ts @@ -16,7 +16,7 @@ import { WebGLRenderTargetOptions } from 'three' -import { defineState, getState } from '@xrengine/hyperflux' +import { defineState, getState } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' import { EngineRenderer } from '../renderer/WebGLRendererSystem' diff --git a/packages/engine/src/xr/XRAnchorComponents.ts b/packages/engine/src/xr/XRAnchorComponents.ts index a7609c829f..3a48ab1140 100644 --- a/packages/engine/src/xr/XRAnchorComponents.ts +++ b/packages/engine/src/xr/XRAnchorComponents.ts @@ -2,8 +2,8 @@ import { useEffect } from 'react' import { BufferGeometry, Mesh, MeshLambertMaterial, MeshStandardMaterial, ShadowMaterial } from 'three' import matches from 'ts-matches' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { defineAction, getState, State, useHookstate } from '@xrengine/hyperflux' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { defineAction, getState, State, useHookstate } from '@etherealengine/hyperflux' import { matchesQuaternion, matchesVector3 } from '../common/functions/MatchesUtils' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/xr/XRAnchorSystem.ts b/packages/engine/src/xr/XRAnchorSystem.ts index 140f50a197..79e8c561ba 100644 --- a/packages/engine/src/xr/XRAnchorSystem.ts +++ b/packages/engine/src/xr/XRAnchorSystem.ts @@ -16,8 +16,8 @@ import { Vector3 } from 'three' -import { smootheLerpAlpha } from '@xrengine/common/src/utils/smootheLerpAlpha' -import { createActionQueue, getState, removeActionQueue, startReactor, useState } from '@xrengine/hyperflux' +import { smootheLerpAlpha } from '@etherealengine/common/src/utils/smootheLerpAlpha' +import { createActionQueue, getState, removeActionQueue, startReactor, useState } from '@etherealengine/hyperflux' import { V_010 } from '../common/constants/MathConstants' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/xr/XRCameraSystem.ts b/packages/engine/src/xr/XRCameraSystem.ts index dbd18e01da..8f6f9208c1 100644 --- a/packages/engine/src/xr/XRCameraSystem.ts +++ b/packages/engine/src/xr/XRCameraSystem.ts @@ -1,6 +1,6 @@ import { ArrayCamera, PerspectiveCamera, Vector2, Vector3, Vector4 } from 'three' -import { createActionQueue, getState } from '@xrengine/hyperflux' +import { createActionQueue, getState } from '@etherealengine/hyperflux' import { CameraComponent } from '../camera/components/CameraComponent' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/xr/XRComponents.ts b/packages/engine/src/xr/XRComponents.ts index 6cd95136d4..f7dd5d5542 100644 --- a/packages/engine/src/xr/XRComponents.ts +++ b/packages/engine/src/xr/XRComponents.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { BufferGeometry, Mesh } from 'three' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { getState, useHookstate } from '@etherealengine/hyperflux' import { matches } from '../common/functions/MatchesUtils' import { defineComponent, useOptionalComponent } from '../ecs/functions/ComponentFunctions' diff --git a/packages/engine/src/xr/XRControllerFunctions.ts b/packages/engine/src/xr/XRControllerFunctions.ts index a6cd4b01ca..fc2b72b2a3 100644 --- a/packages/engine/src/xr/XRControllerFunctions.ts +++ b/packages/engine/src/xr/XRControllerFunctions.ts @@ -1,6 +1,6 @@ import { AnimationMixer, Group, LoopOnce } from 'three' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { AvatarControllerType, AvatarInputSettingsState } from '../avatar/state/AvatarInputSettingsState' import { addObjectToGroup } from '../scene/components/GroupComponent' diff --git a/packages/engine/src/xr/XRDepthOcclusion.ts b/packages/engine/src/xr/XRDepthOcclusion.ts index 2371ad324b..84eb3eac3f 100644 --- a/packages/engine/src/xr/XRDepthOcclusion.ts +++ b/packages/engine/src/xr/XRDepthOcclusion.ts @@ -6,7 +6,7 @@ import { Not } from 'bitecs' import { useEffect } from 'react' import { Material, Matrix4, Mesh, Shader, ShaderMaterial, ShadowMaterial, Vector2 } from 'three' -import { createActionQueue, getState, removeActionQueue, useHookstate } from '@xrengine/hyperflux' +import { createActionQueue, getState, removeActionQueue, useHookstate } from '@etherealengine/hyperflux' import { addOBCPlugin, removeOBCPlugin } from '../common/functions/OnBeforeCompilePlugin' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/xr/XRDetectedPlanesSystem.ts b/packages/engine/src/xr/XRDetectedPlanesSystem.ts index 78a67c431a..33b784611b 100644 --- a/packages/engine/src/xr/XRDetectedPlanesSystem.ts +++ b/packages/engine/src/xr/XRDetectedPlanesSystem.ts @@ -10,7 +10,7 @@ import { } from 'three' import matches from 'ts-matches' -import { createActionQueue, getState } from '@xrengine/hyperflux' +import { createActionQueue, getState } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' import { Entity } from '../ecs/classes/Entity' diff --git a/packages/engine/src/xr/XRHapticsSystem.ts b/packages/engine/src/xr/XRHapticsSystem.ts index a424bbf6d8..f0e90cb10b 100644 --- a/packages/engine/src/xr/XRHapticsSystem.ts +++ b/packages/engine/src/xr/XRHapticsSystem.ts @@ -1,4 +1,4 @@ -import { createActionQueue, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, removeActionQueue } from '@etherealengine/hyperflux' import { World } from '../ecs/classes/World' import { XRAction } from './XRState' diff --git a/packages/engine/src/xr/XRLightProbeSystem.ts b/packages/engine/src/xr/XRLightProbeSystem.ts index 39b3a83ef6..a4969410d1 100644 --- a/packages/engine/src/xr/XRLightProbeSystem.ts +++ b/packages/engine/src/xr/XRLightProbeSystem.ts @@ -1,4 +1,4 @@ -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' import { World } from '../ecs/classes/World' diff --git a/packages/engine/src/xr/XRPersistentAnchorSystem.ts b/packages/engine/src/xr/XRPersistentAnchorSystem.ts index 337a95a868..c2c38e7481 100644 --- a/packages/engine/src/xr/XRPersistentAnchorSystem.ts +++ b/packages/engine/src/xr/XRPersistentAnchorSystem.ts @@ -1,6 +1,6 @@ import { Quaternion, Vector3 } from 'three' -import { getState } from '@xrengine/hyperflux' +import { getState } from '@etherealengine/hyperflux' import { Engine } from '../ecs/classes/Engine' import { World } from '../ecs/classes/World' diff --git a/packages/engine/src/xr/XRScenePlacementShader.ts b/packages/engine/src/xr/XRScenePlacementShader.ts index cf74404eac..60942418c2 100644 --- a/packages/engine/src/xr/XRScenePlacementShader.ts +++ b/packages/engine/src/xr/XRScenePlacementShader.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { Material, Mesh } from 'three' -import { getState, useHookstate } from '@xrengine/hyperflux' +import { getState, useHookstate } from '@etherealengine/hyperflux' import { World } from '../ecs/classes/World' import { Object3DWithEntity, startGroupQueryReactor } from '../scene/components/GroupComponent' diff --git a/packages/engine/src/xr/XRSessionFunctions.ts b/packages/engine/src/xr/XRSessionFunctions.ts index 6cd9a6d181..f613b69196 100644 --- a/packages/engine/src/xr/XRSessionFunctions.ts +++ b/packages/engine/src/xr/XRSessionFunctions.ts @@ -1,7 +1,7 @@ import { Quaternion, Vector3 } from 'three' -import { createHookableFunction } from '@xrengine/common/src/utils/createHookableFunction' -import { dispatchAction, getState } from '@xrengine/hyperflux' +import { createHookableFunction } from '@etherealengine/common/src/utils/createHookableFunction' +import { dispatchAction, getState } from '@etherealengine/hyperflux' import { AvatarHeadDecapComponent } from '../avatar/components/AvatarIKComponents' import { V_000 } from '../common/constants/MathConstants' diff --git a/packages/engine/src/xr/XRState.ts b/packages/engine/src/xr/XRState.ts index d029c13a79..c4ee311864 100644 --- a/packages/engine/src/xr/XRState.ts +++ b/packages/engine/src/xr/XRState.ts @@ -1,7 +1,7 @@ import { AxesHelper, Quaternion, Vector3 } from 'three' import matches, { Validator } from 'ts-matches' -import { defineAction, defineState, getState, syncStateWithLocalStorage, useHookstate } from '@xrengine/hyperflux' +import { defineAction, defineState, getState, syncStateWithLocalStorage, useHookstate } from '@etherealengine/hyperflux' import { AvatarInputSettingsState } from '../avatar/state/AvatarInputSettingsState' import { isMobile } from '../common/functions/isMobile' diff --git a/packages/engine/src/xr/XRSystem.ts b/packages/engine/src/xr/XRSystem.ts index 9b31773ae5..14910509b1 100755 --- a/packages/engine/src/xr/XRSystem.ts +++ b/packages/engine/src/xr/XRSystem.ts @@ -1,4 +1,4 @@ -import { createActionQueue, getState, removeActionQueue } from '@xrengine/hyperflux' +import { createActionQueue, getState, removeActionQueue } from '@etherealengine/hyperflux' import XR8 from './8thwall/XR8' import { World } from './../ecs/classes/World' diff --git a/packages/engine/src/xrui/WidgetAppService.ts b/packages/engine/src/xrui/WidgetAppService.ts index 8481e57a5a..b82e79ef56 100644 --- a/packages/engine/src/xrui/WidgetAppService.ts +++ b/packages/engine/src/xrui/WidgetAppService.ts @@ -1,5 +1,5 @@ -import { defineAction, defineState, dispatchAction, getState, useState } from '@xrengine/hyperflux' -import { none } from '@xrengine/hyperflux/functions/StateFunctions' +import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux' +import { none } from '@etherealengine/hyperflux/functions/StateFunctions' import { matches, Validator } from '../common/functions/MatchesUtils' import { Engine } from '../ecs/classes/Engine' diff --git a/packages/engine/src/xrui/Widgets.ts b/packages/engine/src/xrui/Widgets.ts index ef2b34ef25..371d00d3da 100644 --- a/packages/engine/src/xrui/Widgets.ts +++ b/packages/engine/src/xrui/Widgets.ts @@ -1,5 +1,5 @@ -import { World } from '@xrengine/engine/src/ecs/classes/World' -import { dispatchAction } from '@xrengine/hyperflux' +import { World } from '@etherealengine/engine/src/ecs/classes/World' +import { dispatchAction } from '@etherealengine/hyperflux' import { Entity } from '../ecs/classes/Entity' import { createXRUI } from './functions/createXRUI' diff --git a/packages/engine/src/xrui/XRUIState.ts b/packages/engine/src/xrui/XRUIState.ts index 3f8192efb4..bb357280c6 100644 --- a/packages/engine/src/xrui/XRUIState.ts +++ b/packages/engine/src/xrui/XRUIState.ts @@ -1,4 +1,4 @@ -import { defineState } from '@xrengine/hyperflux' +import { defineState } from '@etherealengine/hyperflux' export const XRUIState = defineState({ name: 'XRUIState', diff --git a/packages/engine/src/xrui/classes/XRUIManager.ts b/packages/engine/src/xrui/classes/XRUIManager.ts index a9b8d37e35..80a2cc410b 100644 --- a/packages/engine/src/xrui/classes/XRUIManager.ts +++ b/packages/engine/src/xrui/classes/XRUIManager.ts @@ -5,7 +5,7 @@ export class XRUIManager { interactionRays = [] as Array - constructor(public WebLayerModule: typeof import('@xrengine/xrui')) {} + constructor(public WebLayerModule: typeof import('@etherealengine/xrui')) {} - // layoutSystem: import('@xrengine/xrui').EtherealLayoutSystem + // layoutSystem: import('@etherealengine/xrui').EtherealLayoutSystem } diff --git a/packages/engine/src/xrui/components/XRUIComponent.ts b/packages/engine/src/xrui/components/XRUIComponent.ts index f33c80a96f..08f0d58380 100644 --- a/packages/engine/src/xrui/components/XRUIComponent.ts +++ b/packages/engine/src/xrui/components/XRUIComponent.ts @@ -1,4 +1,4 @@ -import type { WebContainer3D } from '@xrengine/xrui' +import type { WebContainer3D } from '@etherealengine/xrui' import { defineComponent } from '../../ecs/functions/ComponentFunctions' import { XRUIManager } from '../classes/XRUIManager' diff --git a/packages/engine/src/xrui/functions/ObjectFitFunctions.ts b/packages/engine/src/xrui/functions/ObjectFitFunctions.ts index 85372af981..4fe9cfaf1b 100644 --- a/packages/engine/src/xrui/functions/ObjectFitFunctions.ts +++ b/packages/engine/src/xrui/functions/ObjectFitFunctions.ts @@ -1,7 +1,7 @@ import { Matrix4, Object3D, PerspectiveCamera, Quaternion, Vector2, Vector3 } from 'three' -import { getState } from '@xrengine/hyperflux' -import type { WebContainer3D } from '@xrengine/xrui' +import { getState } from '@etherealengine/hyperflux' +import type { WebContainer3D } from '@etherealengine/xrui' import { AvatarAnimationComponent, AvatarRigComponent } from '../../avatar/components/AvatarAnimationComponent' import { Object3DUtils } from '../../common/functions/Object3DUtils' diff --git a/packages/engine/src/xrui/functions/createXRUI.tsx b/packages/engine/src/xrui/functions/createXRUI.tsx index 5daae38e70..12953858a0 100644 --- a/packages/engine/src/xrui/functions/createXRUI.tsx +++ b/packages/engine/src/xrui/functions/createXRUI.tsx @@ -3,7 +3,7 @@ import React from 'react' import { createRoot } from 'react-dom/client' import { Group } from 'three' -import type { WebContainer3D } from '@xrengine/xrui' +import type { WebContainer3D } from '@etherealengine/xrui' import { isNode } from '../../common/functions/getEnvironment' import { Entity } from '../../ecs/classes/Entity' @@ -18,10 +18,10 @@ import { setTransformComponent } from '../../transform/components/TransformCompo import { XRUIComponent } from '../components/XRUIComponent' import { XRUIStateContext } from '../XRUIStateContext' -let Ethereal: typeof import('@xrengine/xrui') +let Ethereal: typeof import('@etherealengine/xrui') export async function loadXRUIDeps() { - Ethereal = await import('@xrengine/xrui') + Ethereal = await import('@etherealengine/xrui') } export function createXRUI | null>(UIFunc: React.FC, state = null as S): XRUI { diff --git a/packages/engine/src/xrui/systems/XRUISystem.ts b/packages/engine/src/xrui/systems/XRUISystem.ts index 365d6cf97f..ff46853355 100644 --- a/packages/engine/src/xrui/systems/XRUISystem.ts +++ b/packages/engine/src/xrui/systems/XRUISystem.ts @@ -15,8 +15,8 @@ import { Vector3 } from 'three' -import { getState } from '@xrengine/hyperflux' -import { WebContainer3D } from '@xrengine/xrui' +import { getState } from '@etherealengine/hyperflux' +import { WebContainer3D } from '@etherealengine/xrui' import { Engine } from '../../ecs/classes/Engine' import { Entity } from '../../ecs/classes/Entity' @@ -79,7 +79,7 @@ export default async function XRUISystem(world: World) { // todo - hoist to hyperflux state const maxXruiPointerDistanceSqr = 3 * 3 - const xrui = (XRUIManager.instance = new XRUIManager(await import('@xrengine/xrui'))) + const xrui = (XRUIManager.instance = new XRUIManager(await import('@etherealengine/xrui'))) xrui.WebLayerModule.WebLayerManager.initialize(renderer) xrui.WebLayerModule.WebLayerManager.instance.ktx2Encoder.pool.setWorkerLimit(1) diff --git a/packages/engine/tests/equippables/equippables.test.ts b/packages/engine/tests/equippables/equippables.test.ts index 0db5f31f72..074aef0063 100644 --- a/packages/engine/tests/equippables/equippables.test.ts +++ b/packages/engine/tests/equippables/equippables.test.ts @@ -2,10 +2,10 @@ import { RigidBodyType, ShapeType } from '@dimforge/rapier3d-compat' import assert from 'assert' import { Matrix4, Mesh, MeshNormalMaterial, Quaternion, SphereGeometry, Vector3 } from 'three' -import { NetworkId } from '@xrengine/common/src/interfaces/NetworkId' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { applyIncomingActions, clearOutgoingActions } from '@xrengine/hyperflux' +import { NetworkId } from '@etherealengine/common/src/interfaces/NetworkId' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { applyIncomingActions, clearOutgoingActions } from '@etherealengine/hyperflux' import { Engine } from '../../src/ecs/classes/Engine' import { addComponent, getComponent, hasComponent } from '../../src/ecs/functions/ComponentFunctions' diff --git a/packages/engine/tests/portal/portal.test.ts b/packages/engine/tests/portal/portal.test.ts index 8b42b4fe98..602b0c11ba 100644 --- a/packages/engine/tests/portal/portal.test.ts +++ b/packages/engine/tests/portal/portal.test.ts @@ -2,8 +2,8 @@ import appRootPath from 'app-root-path' import assert from 'assert' import dotenv from 'dotenv-flow' -import { SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { parseSceneDataCacheURLs } from '@xrengine/server-core/src/projects/scene/scene-parser' +import { SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { parseSceneDataCacheURLs } from '@etherealengine/server-core/src/projects/scene/scene-parser' import sceneJson from '../../../projects/default-project/default.scene.json' diff --git a/packages/engine/tests/setup.js b/packages/engine/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/engine/tests/setup.js +++ b/packages/engine/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/engine/tests/util/createMockNetwork.ts b/packages/engine/tests/util/createMockNetwork.ts index 7db80ef0a9..bf6bf249e6 100644 --- a/packages/engine/tests/util/createMockNetwork.ts +++ b/packages/engine/tests/util/createMockNetwork.ts @@ -1,4 +1,4 @@ -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { Engine } from '../../src/ecs/classes/Engine' import { Network, NetworkTopics } from '../../src/networking/classes/Network' diff --git a/packages/hyperflux/README.md b/packages/hyperflux/README.md index d394d6561a..4dfce29251 100644 --- a/packages/hyperflux/README.md +++ b/packages/hyperflux/README.md @@ -1,8 +1,8 @@ ## HyperFlux -HyperFlux brings together various state management strategies in XREngine, in a way that makes it easy to introspect and test. +HyperFlux brings together various state management strategies in Ethereal Engine, in a way that makes it easy to introspect and test. -In XREngine, we define 3 different stores +In Ethereal Engine, we define 3 different stores The ENGINE store is, meaning actions are dispatched directly on the _**incoming**_ queue, and run on the Engine timer. @@ -16,7 +16,7 @@ createHyperStore({ ```ts // IncomingActionSystem -import { applyIncomingActions } from '@xrengine/hyperflux' +import { applyIncomingActions } from '@etherealengine/hyperflux' export default async function IncomingActionSystem(world) { return () => { applyIncomingActions(Engine.instance.store) diff --git a/packages/hyperflux/functions/ActionFunctions.ts b/packages/hyperflux/functions/ActionFunctions.ts index 66ea29c6ab..4460ae38c9 100644 --- a/packages/hyperflux/functions/ActionFunctions.ts +++ b/packages/hyperflux/functions/ActionFunctions.ts @@ -1,11 +1,11 @@ import { MathUtils } from 'three' import { matches, Validator } from 'ts-matches' -import { OpaqueType } from '@xrengine/common/src/interfaces/OpaqueType' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { deepEqual } from '@xrengine/engine/src/common/functions/deepEqual' +import { OpaqueType } from '@etherealengine/common/src/interfaces/OpaqueType' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { deepEqual } from '@etherealengine/engine/src/common/functions/deepEqual' import { HyperFlux } from './StoreFunctions' diff --git a/packages/hyperflux/functions/ReactorFunctions.tsx b/packages/hyperflux/functions/ReactorFunctions.tsx index 6fd59466b0..baac21f712 100644 --- a/packages/hyperflux/functions/ReactorFunctions.tsx +++ b/packages/hyperflux/functions/ReactorFunctions.tsx @@ -7,7 +7,7 @@ import { DiscreteEventPriority } from 'react-reconciler/constants' -import { isDev } from '@xrengine/common/src/config' +import { isDev } from '@etherealengine/common/src/config' const ReactorReconciler = Reconciler({ getPublicInstance: (instance) => instance, diff --git a/packages/hyperflux/functions/StateFunctions.ts b/packages/hyperflux/functions/StateFunctions.ts index a36fdc5694..e78e10b281 100644 --- a/packages/hyperflux/functions/StateFunctions.ts +++ b/packages/hyperflux/functions/StateFunctions.ts @@ -1,7 +1,7 @@ import { createState, SetInitialStateAction, State } from '@hookstate/core' -import multiLogger from '@xrengine/common/src/logger' -import { isNode } from '@xrengine/engine/src/common/functions/getEnvironment' +import multiLogger from '@etherealengine/common/src/logger' +import { isNode } from '@etherealengine/engine/src/common/functions/getEnvironment' import { HyperFlux, HyperStore } from './StoreFunctions' diff --git a/packages/hyperflux/package.json b/packages/hyperflux/package.json index 1a975e018a..cc54c46735 100644 --- a/packages/hyperflux/package.json +++ b/packages/hyperflux/package.json @@ -1,16 +1,16 @@ { - "name": "@xrengine/hyperflux", + "name": "@etherealengine/hyperflux", "version": "1.1.3", "main": "index.ts", - "description": "State Management for XREngine", + "description": "State Management for Ethereal Engine", "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "author": "", "license": "MIT", "bugs": { - "url": "https://github.com/XRFoundation/XREngine/issues" + "url": "https://github.com/etherealengine/etherealengine/issues" }, "dependencies": { "@hookstate/core": "4.0.0-rc21", @@ -21,7 +21,6 @@ "cross-env": "^7.0.3" }, "scripts": { - "test": "cross-env TEST=true mocha --config .mocharc.js", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "test": "cross-env TEST=true mocha --config .mocharc.js" } } diff --git a/packages/hyperflux/scripts/update-name-gh-package.js b/packages/hyperflux/scripts/update-name-gh-package.js deleted file mode 100644 index e38d11b918..0000000000 --- a/packages/hyperflux/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/hyperflux'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/hyperflux/tests/hyperflux.test.ts b/packages/hyperflux/tests/hyperflux.test.ts index c991f5eabf..80e7d3532d 100644 --- a/packages/hyperflux/tests/hyperflux.test.ts +++ b/packages/hyperflux/tests/hyperflux.test.ts @@ -1,7 +1,7 @@ import assert from 'assert' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { matches, matchesWithDefault } from '@xrengine/engine/src/common/functions/MatchesUtils' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { matches, matchesWithDefault } from '@etherealengine/engine/src/common/functions/MatchesUtils' import { addActionReceptor, diff --git a/packages/hyperflux/tests/setup.js b/packages/hyperflux/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/hyperflux/tests/setup.js +++ b/packages/hyperflux/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/instanceserver/LICENSE b/packages/instanceserver/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/instanceserver/LICENSE +++ b/packages/instanceserver/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/instanceserver/package.json b/packages/instanceserver/package.json index c671e65191..7b0e1a42a2 100755 --- a/packages/instanceserver/package.json +++ b/packages/instanceserver/package.json @@ -1,6 +1,6 @@ { - "name": "@xrengine/instanceserver", - "description": "Multiplayer Instanceserver for XREngine", + "name": "@etherealengine/instanceserver", + "description": "Multiplayer Instanceserver for Ethereal Engine", "version": "1.1.3", "private": true, "homepage": "", @@ -18,8 +18,8 @@ "vr" ], "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.io" }, "contributors": [], "bugs": {}, @@ -49,9 +49,9 @@ "@google-cloud/agones-sdk": "1.22.0", "@kubernetes/client-node": "0.16.3", "@swc/core": "^1.2.210", - "@xrengine/engine": "^1.1.3", - "@xrengine/projects": "^1.1.3", - "@xrengine/server-core": "^1.1.3", + "@etherealengine/engine": "^1.1.3", + "@etherealengine/projects": "^1.1.3", + "@etherealengine/server-core": "^1.1.3", "aws-sdk": "2.1113.0", "compression": "1.7.4", "cors": "2.8.5", diff --git a/packages/instanceserver/src/NetworkFunctions.ts b/packages/instanceserver/src/NetworkFunctions.ts index d0394b4562..325ecbd75f 100755 --- a/packages/instanceserver/src/NetworkFunctions.ts +++ b/packages/instanceserver/src/NetworkFunctions.ts @@ -1,29 +1,29 @@ import { DataConsumer, DataProducer } from 'mediasoup/node/lib/types' import { Spark } from 'primus' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { SpawnPoseComponent } from '@xrengine/engine/src/avatar/components/SpawnPoseComponent' -import { respawnAvatar } from '@xrengine/engine/src/avatar/functions/respawnAvatar' -import checkPositionIsValid from '@xrengine/engine/src/common/functions/checkPositionIsValid' -import { performance } from '@xrengine/engine/src/common/functions/performance' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { getComponent } from '@xrengine/engine/src/ecs/functions/ComponentFunctions' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { NetworkPeerFunctions } from '@xrengine/engine/src/networking/functions/NetworkPeerFunctions' -import { JoinWorldRequestData } from '@xrengine/engine/src/networking/functions/receiveJoinWorld' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { GroupComponent } from '@xrengine/engine/src/scene/components/GroupComponent' -import { TransformComponent } from '@xrengine/engine/src/transform/components/TransformComponent' -import { dispatchAction, getState } from '@xrengine/hyperflux' -import { Action } from '@xrengine/hyperflux/functions/ActionFunctions' -import { Application } from '@xrengine/server-core/declarations' -import config from '@xrengine/server-core/src/appconfig' -import { localConfig } from '@xrengine/server-core/src/config' -import multiLogger from '@xrengine/server-core/src/ServerLogger' -import getLocalServerIp from '@xrengine/server-core/src/util/get-local-server-ip' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { SpawnPoseComponent } from '@etherealengine/engine/src/avatar/components/SpawnPoseComponent' +import { respawnAvatar } from '@etherealengine/engine/src/avatar/functions/respawnAvatar' +import checkPositionIsValid from '@etherealengine/engine/src/common/functions/checkPositionIsValid' +import { performance } from '@etherealengine/engine/src/common/functions/performance' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { NetworkPeerFunctions } from '@etherealengine/engine/src/networking/functions/NetworkPeerFunctions' +import { JoinWorldRequestData } from '@etherealengine/engine/src/networking/functions/receiveJoinWorld' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { GroupComponent } from '@etherealengine/engine/src/scene/components/GroupComponent' +import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent' +import { dispatchAction, getState } from '@etherealengine/hyperflux' +import { Action } from '@etherealengine/hyperflux/functions/ActionFunctions' +import { Application } from '@etherealengine/server-core/declarations' +import config from '@etherealengine/server-core/src/appconfig' +import { localConfig } from '@etherealengine/server-core/src/config' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' +import getLocalServerIp from '@etherealengine/server-core/src/util/get-local-server-ip' import { SocketWebRTCServerNetwork } from './SocketWebRTCServerNetwork' import { closeTransport } from './WebRTCFunctions' diff --git a/packages/instanceserver/src/SocketFunctions.ts b/packages/instanceserver/src/SocketFunctions.ts index 08773a74fc..c404c3753f 100644 --- a/packages/instanceserver/src/SocketFunctions.ts +++ b/packages/instanceserver/src/SocketFunctions.ts @@ -1,12 +1,12 @@ -import { AuthError } from '@xrengine/common/src/enums/AuthError' -import { AuthTask } from '@xrengine/common/src/interfaces/AuthTask' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { EngineActions, getEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { matchActionOnce } from '@xrengine/engine/src/networking/functions/matchActionOnce' -import { Application } from '@xrengine/server-core/declarations' -import multiLogger from '@xrengine/server-core/src/ServerLogger' +import { AuthError } from '@etherealengine/common/src/enums/AuthError' +import { AuthTask } from '@etherealengine/common/src/interfaces/AuthTask' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { EngineActions, getEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { matchActionOnce } from '@etherealengine/engine/src/networking/functions/matchActionOnce' +import { Application } from '@etherealengine/server-core/declarations' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' import { authorizeUserToJoinServer, diff --git a/packages/instanceserver/src/SocketWebRTCServerNetwork.ts b/packages/instanceserver/src/SocketWebRTCServerNetwork.ts index 11e86f460f..64939590ce 100755 --- a/packages/instanceserver/src/SocketWebRTCServerNetwork.ts +++ b/packages/instanceserver/src/SocketWebRTCServerNetwork.ts @@ -9,17 +9,17 @@ import { Worker } from 'mediasoup/node/lib/types' -import { MediaStreamAppData } from '@xrengine/common/src/interfaces/MediaStreamConstants' -import { PeersUpdateType } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { Network } from '@xrengine/engine/src/networking/classes/Network' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import { WorldState } from '@xrengine/engine/src/networking/interfaces/WorldState' -import { clearOutgoingActions, getState } from '@xrengine/hyperflux' -import { Action, addOutgoingTopicIfNecessary, Topic } from '@xrengine/hyperflux/functions/ActionFunctions' -import { Application } from '@xrengine/server-core/declarations' -import multiLogger from '@xrengine/server-core/src/ServerLogger' +import { MediaStreamAppData } from '@etherealengine/common/src/interfaces/MediaStreamConstants' +import { PeersUpdateType } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { Network } from '@etherealengine/engine/src/networking/classes/Network' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState' +import { clearOutgoingActions, getState } from '@etherealengine/hyperflux' +import { Action, addOutgoingTopicIfNecessary, Topic } from '@etherealengine/hyperflux/functions/ActionFunctions' +import { Application } from '@etherealengine/server-core/declarations' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' import { setupSubdomain } from './NetworkFunctions' import { startWebRTC } from './WebRTCFunctions' diff --git a/packages/instanceserver/src/WebRTCFunctions.ts b/packages/instanceserver/src/WebRTCFunctions.ts index be3a3fe3cc..91fe883e48 100755 --- a/packages/instanceserver/src/WebRTCFunctions.ts +++ b/packages/instanceserver/src/WebRTCFunctions.ts @@ -14,13 +14,13 @@ import { import os from 'os' import { Spark } from 'primus' -import { MediaStreamAppData, MediaTagType } from '@xrengine/common/src/interfaces/MediaStreamConstants' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { MessageTypes } from '@xrengine/engine/src/networking/enums/MessageTypes' -import config from '@xrengine/server-core/src/appconfig' -import { localConfig, sctpParameters } from '@xrengine/server-core/src/config' -import multiLogger from '@xrengine/server-core/src/ServerLogger' -import { WebRtcTransportParams } from '@xrengine/server-core/src/types/WebRtcTransportParams' +import { MediaStreamAppData, MediaTagType } from '@etherealengine/common/src/interfaces/MediaStreamConstants' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { MessageTypes } from '@etherealengine/engine/src/networking/enums/MessageTypes' +import config from '@etherealengine/server-core/src/appconfig' +import { localConfig, sctpParameters } from '@etherealengine/server-core/src/config' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' +import { WebRtcTransportParams } from '@etherealengine/server-core/src/types/WebRtcTransportParams' import { getUserIdFromPeerID } from './NetworkFunctions' import { diff --git a/packages/instanceserver/src/channels.ts b/packages/instanceserver/src/channels.ts index b1b23637f0..551d674c95 100755 --- a/packages/instanceserver/src/channels.ts +++ b/packages/instanceserver/src/channels.ts @@ -4,30 +4,30 @@ import '@feathersjs/transport-commons' import { decode } from 'jsonwebtoken' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' -import { Channel } from '@xrengine/common/src/interfaces/Channel' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { AvatarCommonModule } from '@xrengine/engine/src/avatar/AvatarCommonModule' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions, getEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { initSystems } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import { NetworkTopics } from '@xrengine/engine/src/networking/classes/Network' -import { matchActionOnce } from '@xrengine/engine/src/networking/functions/matchActionOnce' -import { NetworkPeerFunctions } from '@xrengine/engine/src/networking/functions/NetworkPeerFunctions' -import { RealtimeNetworkingModule } from '@xrengine/engine/src/networking/RealtimeNetworkingModule' -import { SceneCommonModule } from '@xrengine/engine/src/scene/SceneCommonModule' -import { updateSceneFromJSON } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -import { TransformModule } from '@xrengine/engine/src/transform/TransformModule' -import { dispatchAction } from '@xrengine/hyperflux' -import { loadEngineInjection } from '@xrengine/projects/loadEngineInjection' -import { Application } from '@xrengine/server-core/declarations' -import config from '@xrengine/server-core/src/appconfig' -import { getProjectsList } from '@xrengine/server-core/src/projects/project/project.service' -import multiLogger from '@xrengine/server-core/src/ServerLogger' -import getLocalServerIp from '@xrengine/server-core/src/util/get-local-server-ip' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' +import { Channel } from '@etherealengine/common/src/interfaces/Channel' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { AvatarCommonModule } from '@etherealengine/engine/src/avatar/AvatarCommonModule' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions, getEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { initSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import { NetworkTopics } from '@etherealengine/engine/src/networking/classes/Network' +import { matchActionOnce } from '@etherealengine/engine/src/networking/functions/matchActionOnce' +import { NetworkPeerFunctions } from '@etherealengine/engine/src/networking/functions/NetworkPeerFunctions' +import { RealtimeNetworkingModule } from '@etherealengine/engine/src/networking/RealtimeNetworkingModule' +import { SceneCommonModule } from '@etherealengine/engine/src/scene/SceneCommonModule' +import { updateSceneFromJSON } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +import { TransformModule } from '@etherealengine/engine/src/transform/TransformModule' +import { dispatchAction } from '@etherealengine/hyperflux' +import { loadEngineInjection } from '@etherealengine/projects/loadEngineInjection' +import { Application } from '@etherealengine/server-core/declarations' +import config from '@etherealengine/server-core/src/appconfig' +import { getProjectsList } from '@etherealengine/server-core/src/projects/project/project.service' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' +import getLocalServerIp from '@etherealengine/server-core/src/util/get-local-server-ip' import { authorizeUserToJoinServer } from './NetworkFunctions' import { SocketWebRTCServerNetwork } from './SocketWebRTCServerNetwork' diff --git a/packages/instanceserver/src/index.ts b/packages/instanceserver/src/index.ts index 40cdc5f35c..699edf1ad7 100644 --- a/packages/instanceserver/src/index.ts +++ b/packages/instanceserver/src/index.ts @@ -1,4 +1,4 @@ -import { updateAppConfig } from '@xrengine/server-core/src/updateAppConfig' +import { updateAppConfig } from '@etherealengine/server-core/src/updateAppConfig' const init = async () => { await updateAppConfig() diff --git a/packages/instanceserver/src/preload-location.ts b/packages/instanceserver/src/preload-location.ts index 03719a7342..ac8a1e6803 100644 --- a/packages/instanceserver/src/preload-location.ts +++ b/packages/instanceserver/src/preload-location.ts @@ -1,7 +1,7 @@ -// import { WorldScene } from '@xrengine/engine/src/scene/systems/SceneLoadingSystem' -// import { Application } from '@xrengine/server-core/declarations' -// import config from '@xrengine/server-core/src/appconfig' -// import getLocalServerIp from '@xrengine/server-core/src/util/get-local-server-ip' +// import { WorldScene } from '@etherealengine/engine/src/scene/systems/SceneLoadingSystem' +// import { Application } from '@etherealengine/server-core/declarations' +// import config from '@etherealengine/server-core/src/appconfig' +// import getLocalServerIp from '@etherealengine/server-core/src/util/get-local-server-ip' // TODO: fix this file - currently unused (but nice to have) diff --git a/packages/instanceserver/src/start.ts b/packages/instanceserver/src/start.ts index 10c30832e0..995510202b 100755 --- a/packages/instanceserver/src/start.ts +++ b/packages/instanceserver/src/start.ts @@ -3,23 +3,23 @@ import fs from 'fs' import https from 'https' import psList from 'ps-list' -import { pipe } from '@xrengine/common/src/utils/pipe' +import { pipe } from '@etherealengine/common/src/utils/pipe' -import '@xrengine/engine/src/patchEngineNode' +import '@etherealengine/engine/src/patchEngineNode' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { EngineActions, getEngineState } from '@xrengine/engine/src/ecs/classes/EngineState' -import { matchActionOnce } from '@xrengine/engine/src/networking/functions/matchActionOnce' -import { Application, ServerMode } from '@xrengine/server-core/declarations' -import config from '@xrengine/server-core/src/appconfig' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { EngineActions, getEngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' +import { matchActionOnce } from '@etherealengine/engine/src/networking/functions/matchActionOnce' +import { Application, ServerMode } from '@etherealengine/server-core/declarations' +import config from '@etherealengine/server-core/src/appconfig' import { configureK8s, configureOpenAPI, configurePrimus, configureRedis, createFeathersExpressApp -} from '@xrengine/server-core/src/createApp' -import multiLogger from '@xrengine/server-core/src/ServerLogger' +} from '@etherealengine/server-core/src/createApp' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' import channels from './channels' import { setupSocketFunctions } from './SocketFunctions' @@ -55,7 +55,7 @@ export const start = async (): Promise => { agonesSDK.ready().catch((err) => { logger.error(err) throw new Error( - '\x1b[33mError: Agones is not running!. If you are in local development, please run xrengine/scripts/sh start-agones.sh and restart server\x1b[0m' + '\x1b[33mError: Agones is not running!. If you are in local development, please run etherealengine/scripts/sh start-agones.sh and restart server\x1b[0m' ) }) app.agonesSDK = agonesSDK @@ -95,7 +95,7 @@ export const start = async (): Promise => { // exec('docker ps | grep mariadb', (err, stdout, stderr) => { // if (!stdout.includes('mariadb')) { // throw new Error( - // '\x1b[33mError: DB proccess is not running or Docker is not running!. If you are in local development, please run xrengine/scripts/start-db.sh and restart server\x1b[0m' + // '\x1b[33mError: DB proccess is not running or Docker is not running!. If you are in local development, please run etherealengine/scripts/start-db.sh and restart server\x1b[0m' // ) // } // }) diff --git a/packages/instanceserver/tests/setup.js b/packages/instanceserver/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/instanceserver/tests/setup.js +++ b/packages/instanceserver/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/instanceserver/vite.config.ts b/packages/instanceserver/vite.config.ts index 0a50cd203d..6bb5d2be46 100644 --- a/packages/instanceserver/vite.config.ts +++ b/packages/instanceserver/vite.config.ts @@ -56,7 +56,7 @@ export default defineConfig( /* lib: { entry: path.resolve(dirname(import.meta), 'src/index.ts'), - name: 'xrengine-instanceserver' + name: 'etherealengine-instanceserver' },*/ target: 'esnext', sourcemap: 'inline', diff --git a/packages/matchmaking/README-pre-helm.md b/packages/matchmaking/README-pre-helm.md index c5c6f11d46..7bf2a53aa2 100644 --- a/packages/matchmaking/README-pre-helm.md +++ b/packages/matchmaking/README-pre-helm.md @@ -1,4 +1,4 @@ -# xrengine-matchmaking +# etherealengine-matchmaking ##first run: start minikube and install open-match pods, configs and services @@ -20,7 +20,7 @@ then build custom pods ```bash cd packages/matchmaking/ -kubectl create namespace xrengine-matchmaking +kubectl create namespace etherealengine-matchmaking #this line for localhost development eval $(minikube docker-env) @@ -64,8 +64,8 @@ team size is probably here: ###cleanup delete custom pods ```bash -kubectl -n xrengine-matchmaking delete pod,svc --all -kubectl delete namespace xrengine-matchmaking +kubectl -n etherealengine-matchmaking delete pod,svc --all +kubectl delete namespace etherealengine-matchmaking ``` delete open-match diff --git a/packages/matchmaking/README.md b/packages/matchmaking/README.md index 57fbc94376..d3c4f335bf 100644 --- a/packages/matchmaking/README.md +++ b/packages/matchmaking/README.md @@ -1,4 +1,4 @@ -# xrengine-matchmaking +# etherealengine-matchmaking ##Start minikube: First, you'll need to start minikube with the `ingress` addon. This will allow the Open Match Helm chart to install @@ -13,11 +13,11 @@ If minikube has already been created, you can enable the ingress by running `min Follow the [instructions](https://helm.sh/docs/intro/install/) for installing Helm on your OS. ## Install Open Match with local open-match Helm chart -A Helm chart containing all of the Open Match resources needed for XREngine matchmaking is located +A Helm chart containing all of the Open Match resources needed for Ethereal Engine matchmaking is located in `packages/ops/open-match`. You can install it by running `helm install --set frontend.host= open-match packages/ops/open-match` -`` is a hostname that the frontend service will be reachable at, e.g. `local-matchmaking.xrengine.io`. +`` is a hostname that the frontend service will be reachable at, e.g. `local-matchmaking.etherealengine.io`. You can set it to be whatever you want. After you do, you'll need to edit your computer's hostfile to point this hostname to the IP address of minikube. @@ -28,7 +28,7 @@ privileges to edit it. You'll need to add a line like this: ` `, e.g. -`192.168.99.101 local-matchmaking.xrengine.io` +`192.168.99.101 local-matchmaking.etherealengine.io` Make sure to save the file after you've added this line. This will tell your machine to route traffic to that hostname to minikube. When combined with the Ingress that the Open Match Helm chart installs, this will then route the traffic @@ -54,8 +54,8 @@ eval $(minikube docker-env) ./build-all-pods.sh ``` -This will build the images with no registry by default, e.g. the image names will just be `xrengine-matchmaking-director` -and `xrengine-matchmaking-matchfunction`. If you wish to build them to a registry, +This will build the images with no registry by default, e.g. the image names will just be `etherealengine-matchmaking-director` +and `etherealengine-matchmaking-matchfunction`. If you wish to build them to a registry, set the `REGISTRY` environment variable, e.g. `REGISTRY=example-reg ./build-all-pods.sh` If you want to automatically push the images to the registry they've been built towards, add `push` as a parameter: @@ -65,12 +65,12 @@ builds the images in minikube's Docker environment, which means it already has a need to source them from an external Docker registry. Each of the build scripts will generate a timestamp and use that as the tag for the images that are built. For example, -an image would be generated with a full name of `xrengine-matchmaking-director:23-12-21T12-55-03`. +an image would be generated with a full name of `etherealengine-matchmaking-director:23-12-21T12-55-03`. You can see the tags in the build logs, where they're printed out like the following: -`BUILDING matchfunction as xrengine-matchmaking-matchfunction:23-12-21T14-16-09` +`BUILDING matchfunction as etherealengine-matchmaking-matchfunction:23-12-21T14-16-09` ## Install matchmaking via Helm chart -You'll next install the matchmaking deployment using the Helm chart in packages/ops/xrengine-matchmaking. Make sure that +You'll next install the matchmaking deployment using the Helm chart in packages/ops/etherealengine-matchmaking. Make sure that the path at the end of the following command is relative to the directory you're still in; it was written assuming you're in packages/matchmaking after just building the images, and will be different if you're in the repo root or some other directory. @@ -79,15 +79,15 @@ The file referenced below as path/to/matchmaking.values.yaml is a simple configu `packages/ops/configs/local.matchmaking.template.values.yaml`. You should make a copy of this template and remove the word 'template' from the file name. If you are going to push these images to an external registry, i.e. you're not just building them locally for minikube, then you'll need to add `/` to the start of both `repository`settings. -For example, if pushing the image to the Docker Hub repo `xrengine-test`, you would make director.image.repository -`xrengine-test/xrengine-matchmaking-director` and matchfunction.image.repository `xrengine-test/xrengine-matchmaking-matchfunction` +For example, if pushing the image to the Docker Hub repo `etherealengine-test`, you would make director.image.repository +`etherealengine-test/etherealengine-matchmaking-director` and matchfunction.image.repository `etherealengine-test/etherealengine-matchmaking-matchfunction` If you are installing this on minikube, you don't need to specify a registry. By running `eval $(minikube dockerenv)`, you're building the images into minikube's Docker environment. When the values.yaml/Helm config file is ready, run the following command: ``` -helm install -f path/to/matchmaking.yaml --set director.image.tag=,matchfunction.image.tag= -matchmaking ../ops/xrengine-matchmaking +helm install -f path/to/matchmaking.yaml --set director.image.tag=,matchfunction.image.tag= -matchmaking ../ops/etherealengine-matchmaking ``` where `` is the timestamp tag that can be found on in the builder logs. @@ -104,12 +104,12 @@ If you only want to rebuild one, run `RELEASE= ./build-pod.sh ,matchfunction.image.tag= -matchmaking ../ops/xrengine-matchmaking` +`helm upgrade --reuse-values --set director.image.tag=,matchfunction.image.tag= -matchmaking ../ops/etherealengine-matchmaking` This will update the matchmaking deployment with the newly timestamp-tagged images. If you only updated and rebuilt one of the services, and did so by just running `build-pod.sh` instead of `build-all-pods.sh`, then you must omit the `--set .image.tag=` for the service that didn't get rebuilt, since it will not have a new image tag. For example, if you just updated the matchfunction service, run -`helm upgrade --reuse-values --set matchfunction.image.tag= -matchmaking ../ops/xrengine-matchmaking` +`helm upgrade --reuse-values --set matchfunction.image.tag= -matchmaking ../ops/etherealengine-matchmaking` ## Build and deploy locally in one command The script `matchmaking/build-all-and-refresh-pods-local.sh` can build and deploy the director and matchfunction locally @@ -122,8 +122,8 @@ This will build the two services, timestamp-tag them, then automatically run `he timestamp-tags and the config file, which will install the deployment if it's not already installed and update the tag if it is, forcing the deployment to download the new versions of the services. -## Uninstall Open Match and xrengine-matchmaking -To uninstall xrengine-matchmaing, run `helm uninstall -matchmaking` +## Uninstall Open Match and etherealengine-matchmaking +To uninstall etherealengine-matchmaing, run `helm uninstall -matchmaking` To uninstall Open Match, from `helm uninstall open-match` diff --git a/packages/matchmaking/build-all-and-refresh-pods-local.sh b/packages/matchmaking/build-all-and-refresh-pods-local.sh index 52e20c5f52..b1d777ce49 100755 --- a/packages/matchmaking/build-all-and-refresh-pods-local.sh +++ b/packages/matchmaking/build-all-and-refresh-pods-local.sh @@ -12,7 +12,7 @@ REGISTRY=$REGISTRY DEPLOY_TIME=$DEPLOY_TIME ./build-all-pods.sh sleep 2 if [[ -z $HELM_CONFIG ]] then - helm upgrade --install --reuse-values --set director.image.tag=$DEPLOY_TIME,matchfunction.image.tag=$DEPLOY_TIME local-matchmaking ../ops/xrengine-matchmaking + helm upgrade --install --reuse-values --set director.image.tag=$DEPLOY_TIME,matchfunction.image.tag=$DEPLOY_TIME local-matchmaking ../ops/etherealengine-matchmaking else - helm upgrade --install --reuse-values -f $HELM_CONFIG --set director.image.tag=$DEPLOY_TIME,matchfunction.image.tag=$DEPLOY_TIME local-matchmaking ../ops/xrengine-matchmaking + helm upgrade --install --reuse-values -f $HELM_CONFIG --set director.image.tag=$DEPLOY_TIME,matchfunction.image.tag=$DEPLOY_TIME local-matchmaking ../ops/etherealengine-matchmaking fi \ No newline at end of file diff --git a/packages/matchmaking/build-all-pods.sh b/packages/matchmaking/build-all-pods.sh index a2f4c49475..c9b17d6ff2 100755 --- a/packages/matchmaking/build-all-pods.sh +++ b/packages/matchmaking/build-all-pods.sh @@ -13,6 +13,6 @@ REGISTRY=$REGISTRY DEPLOY_TIME=$DEPLOY_TIME ./build-pod.sh matchfunction "$1" if [[ $2 = "push" ]] then - docker push $REGISTRY/xrengine-matchmaking-director - docker push $REGISTRY/xrengine-matchmaking-matchfunction + docker push $REGISTRY/etherealengine-matchmaking-director + docker push $REGISTRY/etherealengine-matchmaking-matchfunction fi \ No newline at end of file diff --git a/packages/matchmaking/build-pod.sh b/packages/matchmaking/build-pod.sh index a5691867c0..3ca8c9ae6c 100755 --- a/packages/matchmaking/build-pod.sh +++ b/packages/matchmaking/build-pod.sh @@ -14,7 +14,7 @@ then echo "module name is required" fi -MODULE=xrengine-matchmaking-$1 +MODULE=etherealengine-matchmaking-$1 pushd "./open-match-custom-pods/$1" || exit diff --git a/packages/matchmaking/install-all.sh b/packages/matchmaking/install-all.sh index c55188a6e9..e22c359c9a 100644 --- a/packages/matchmaking/install-all.sh +++ b/packages/matchmaking/install-all.sh @@ -10,7 +10,7 @@ kubectl apply --namespace open-match \ -f https://open-match.dev/install/v1.3.0-rc.1/yaml/07-open-match-default-evaluator.yaml -kubectl create namespace xrengine-matchmaking +kubectl create namespace etherealengine-matchmaking #this line for localhost development eval $(minikube docker-env) diff --git a/packages/matchmaking/open-match-custom-pods/director/director.yaml b/packages/matchmaking/open-match-custom-pods/director/director.yaml index b61305886c..fefa47c2ed 100644 --- a/packages/matchmaking/open-match-custom-pods/director/director.yaml +++ b/packages/matchmaking/open-match-custom-pods/director/director.yaml @@ -15,11 +15,11 @@ apiVersion: v1 kind: Pod metadata: - name: xrengine-matchmaking-director - namespace: xrengine-matchmaking + name: etherealengine-matchmaking-director + namespace: etherealengine-matchmaking spec: containers: - - name: xrengine-matchmaking-director - image: REGISTRY_PLACEHOLDER/xrengine-matchmaking-director:latest + - name: etherealengine-matchmaking-director + image: REGISTRY_PLACEHOLDER/etherealengine-matchmaking-director:latest imagePullPolicy: Always - hostname: xrengine-matchmaking-director + hostname: etherealengine-matchmaking-director diff --git a/packages/matchmaking/open-match-custom-pods/matchfunction/matchfunction.yaml b/packages/matchmaking/open-match-custom-pods/matchfunction/matchfunction.yaml index 94256588e3..eff04ac2f3 100644 --- a/packages/matchmaking/open-match-custom-pods/matchfunction/matchfunction.yaml +++ b/packages/matchmaking/open-match-custom-pods/matchfunction/matchfunction.yaml @@ -15,15 +15,15 @@ apiVersion: v1 kind: Pod metadata: - name: xrengine-matchmaking-matchfunction - namespace: xrengine-matchmaking + name: etherealengine-matchmaking-matchfunction + namespace: etherealengine-matchmaking labels: - app: xrengine-matchmaking + app: etherealengine-matchmaking component: matchfunction spec: containers: - - name: xrengine-matchmaking-matchfunction - image: REGISTRY_PLACEHOLDER/xrengine-matchmaking-matchfunction:latest + - name: etherealengine-matchmaking-matchfunction + image: REGISTRY_PLACEHOLDER/etherealengine-matchmaking-matchfunction:latest imagePullPolicy: Always ports: - name: grpc @@ -32,14 +32,14 @@ spec: kind: Service apiVersion: v1 metadata: - name: xrengine-matchmaking-matchfunction - namespace: xrengine-matchmaking + name: etherealengine-matchmaking-matchfunction + namespace: etherealengine-matchmaking labels: - app: xrengine-matchmaking + app: etherealengine-matchmaking component: matchfunction spec: selector: - app: xrengine-matchmaking + app: etherealengine-matchmaking component: matchfunction clusterIP: None type: ClusterIP diff --git a/packages/matchmaking/package.json b/packages/matchmaking/package.json index da3e2f9815..6fc634a05d 100644 --- a/packages/matchmaking/package.json +++ b/packages/matchmaking/package.json @@ -1,9 +1,9 @@ { - "name": "@xrengine/matchmaking", + "name": "@etherealengine/matchmaking", "version": "1.1.3", "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.org" }, "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "npmClient": "npm", "repository": { "type": "git", - "url": "git+https://github.com/XRFoundation/XREngine.git" + "url": "git+https://github.com/etherealengine/etherealengine.git" }, "scripts": { "check-errors": "tsc --noemit", @@ -28,8 +28,7 @@ "local-minikube-stop": "minikube stop", "open-frontend-service-port": "kubectl port-forward --namespace open-match service/open-match-frontend 51504:51504", "ts-node": "10.8.2", - "typescript": "4.9.5", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "typescript": "4.9.5" }, "dependencies": { "abort-controller": "^3.0.0", diff --git a/packages/matchmaking/scripts/update-name-gh-package.js b/packages/matchmaking/scripts/update-name-gh-package.js deleted file mode 100644 index 92505dfb6c..0000000000 --- a/packages/matchmaking/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/matchmaking'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/ops/.gitignore b/packages/ops/.gitignore deleted file mode 100755 index f6ae6e1dfb..0000000000 --- a/packages/ops/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ - -.xrengine-secrets - -helm_values.yaml - -*.tgz - -configs/*prod* -configs/*staging* -configs/*dev* -configs/*splunk* - -values/*.yaml - - -xrengine/Chart\.lock - -_site -.sass-cache -configs/beta.values.yaml diff --git a/packages/ops/CHANGELOG.md b/packages/ops/CHANGELOG.md deleted file mode 100755 index 6e80bf2f9b..0000000000 --- a/packages/ops/CHANGELOG.md +++ /dev/null @@ -1,568 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.5.2](https://github.com/XRFoundation/XREngine/compare/v0.5.1...v0.5.2) (2022-04-07) - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - - - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.36 (2021-06-25) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.35 (2021-06-25) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.34 (2021-06-25) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.33 (2021-06-25) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.32 (2021-06-25) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.31 (2021-06-25) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.30 (2021-06-25) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.29](https://github.com/XRFoundation/XREngine/compare/v0.2.28...v0.2.29) (2021-06-24) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.28](https://github.com/XRFoundation/XREngine/compare/v0.2.27...v0.2.28) (2021-06-22) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.27](https://github.com/XRFoundation/XREngine/compare/v0.2.26...v0.2.27) (2021-05-13) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.26](https://github.com/XRFoundation/XREngine/compare/v0.2.24...v0.2.26) (2021-05-12) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.25](https://github.com/XRFoundation/XREngine/compare/v0.2.24...v0.2.25) (2021-05-12) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.24](https://github.com/XRFoundation/XREngine/compare/v0.2.23...v0.2.24) (2021-05-12) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.23](https://github.com/XRFoundation/XREngine/compare/v0.2.22...v0.2.23) (2021-05-12) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.22](https://github.com/XRFoundation/XREngine/compare/v0.2.21...v0.2.22) (2021-05-05) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.21](https://github.com/xrengine/xrengine/compare/v0.2.20...v0.2.21) (2021-05-05) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.20](https://github.com/xrengine/xrengine/compare/v0.2.18...v0.2.20) (2021-05-04) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.18 (2021-04-22) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## [0.2.11](https://github.com/XRFoundation/XREngine/compare/v0.2.10...v0.2.11) (2021-04-08) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.4 (2021-03-31) - -**Note:** Version bump only for package @xrengine/ops - - - - - -## 0.2.3 (2021-03-31) - -**Note:** Version bump only for package @xrengine/ops diff --git a/packages/ops/LICENSE b/packages/ops/LICENSE deleted file mode 100755 index dcd07e0ea5..0000000000 --- a/packages/ops/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020-2022 XREngine - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/ops/README.md b/packages/ops/README.md deleted file mode 100755 index 80d8b1ed74..0000000000 --- a/packages/ops/README.md +++ /dev/null @@ -1,77 +0,0 @@ -# ethereal-engine-ops - -Deployment and Operations for ethereal engine services - -## One-Click Deployment on Kubernetes using Helm - -You can run the whole platfrom with the following commands: - -``` bash -helm repo add xrengine https://helm.xrengine.io -helm repo update -helm install my-release xrengine/xrengine -``` - -For more details about the ethereal engine chart - -- [Ethereal Engine helm chart](xrengine/) -- [Building the ethereal engine helm chart](https://xrfoundation.github.io/ethereal-engine-docs/docs/devops_deployment/release_helm_chart) - -For deployment on different cloud providers: - -- [Deploying Ethereal Engine on AWS EKS](https://xrfoundation.github.io/ethereal-engine-docs/docs/devops_deployment/AWS_setup) -- [Managing Remote Kubernets Clusters - TBD](https://xrfoundation.github.io/ethereal-engine-docs/docs/devops_deployment/managing_remote_kubernetes) - -Requires Helm and access to a Kubernetes cluster, if you are new to those, check the following instructions: - -- [Installing Helm v3](https://www.digitalocean.com/community/tutorials/how-to-install-software-on-kubernetes-clusters-with-the-helm-3-package-manager) -- [Installing Kubernetes Locally - microk8s](https://ubuntu.com/tutorials/install-a-local-kubernetes-with-microk8s#2-deploying-microk8s) -- [Installing Kubernetes Locally - MiniKube](https://minikube.sigs.k8s.io/docs/start/) -- [Helper Scripts](scripts/) contains useful scripts to speedup preparing your machine with Docker, Helm, k8s, etc. - -## One-Click Deployment on your laptop Docker Compose - -You can run the whole platfrom with the following commands: - -``` bash -git clone git@github.com:xrengine/xrsocial-ops.git -cd xrsocial-ops -docker-compose up -``` - -To run specific services - -``` bash -docker-compose up -``` - -This will pull images from [ethereal engine's docker hub repo](https://hub.docker.com/u/xrengine) - -## Ethereal Engine services - -- [server](https://github.com/XRFoundation/xrsocial): backend server on -- [client](https://github.com/XRFoundation/xrsocial-client): frontend Next.js+react on -- adminer: a lightweight web app to manage database, (Note: password is "password") -- db: MariaDB on default port [mysql://127.0.0.1:3306]() - -## Build docker/compose stack yourself - -If you want to build the whole compose stack on your machine, and not pull the containers from docker-hub - -- install [docker](https://docs.docker.com/get-docker/). -- clone the 5 repos into the same folder with the same names: - - ``` txt - | - +-- xrsocial-client - +-- xrsocial - +-- xrsocial-ops - +-- Editor - ``` - -- `cd xrsocial-ops` -- run `docker-compose -f docker-compose-local.yml build` -- run `docker-compose -f docker-compose-local.yml up` -- all services will be running as detailed in [service](Services) section. - -## Build the Helm Chart yourself diff --git a/packages/ops/chartpress.yaml b/packages/ops/chartpress.yaml deleted file mode 100755 index 71e18da642..0000000000 --- a/packages/ops/chartpress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -charts: - - name: xrengine - repo: - git: xrengine/xrsocial-ops - published: https://helm.xrengine.io \ No newline at end of file diff --git a/packages/ops/configs/agones-default-values.yaml b/packages/ops/configs/agones-default-values.yaml deleted file mode 100755 index 0386fcc854..0000000000 --- a/packages/ops/configs/agones-default-values.yaml +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 2018 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Declare variables to be passed into your templates. - -agones: - metrics: - prometheusEnabled: true - prometheusServiceDiscovery: true - stackdriverEnabled: false - stackdriverProjectID: "" - stackdriverLabels: "" - rbacEnabled: true - registerServiceAccounts: true - registerWebhooks: true - registerApiService: true - crds: - install: true - cleanupOnDelete: true - serviceaccount: - controller: - name: agones-controller - sdk: - name: agones-sdk - createPriorityClass: true - priorityClassName: agones-system - controller: - resources: {} - nodeSelector: {} - tolerations: - - key: "agones.dev/agones-system" - operator: "Equal" - value: "true" - effect: "NoExecute" - affinity: - nodeAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - preference: - matchExpressions: - - key: agones.dev/agones-system - operator: Exists - generateTLS: true - safeToEvict: false - persistentLogs: true - persistentLogsSizeLimitMB: 10000 - logLevel: info - numWorkers: 100 - apiServerQPS: 400 - apiServerQPSBurst: 500 - http: - port: 8080 - healthCheck: - initialDelaySeconds: 3 - periodSeconds: 3 - failureThreshold: 3 - timeoutSeconds: 1 - ping: - install: false - resources: {} - nodeSelector: {} - tolerations: - - key: "agones.dev/agones-system" - operator: "Equal" - value: "true" - effect: "NoExecute" - affinity: - nodeAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - preference: - matchExpressions: - - key: agones.dev/agones-system - operator: Exists - replicas: 2 - http: - expose: true - response: ok - port: 80 - serviceType: NodePort - tcp: - expose: true - rateLimit: 20 - port: 50000 - serviceType: NodePort - healthCheck: - initialDelaySeconds: 3 - periodSeconds: 3 - failureThreshold: 3 - timeoutSeconds: 1 - allocator: - install: true - healthCheck: - initialDelaySeconds: 3 - periodSeconds: 3 - failureThreshold: 3 - timeoutSeconds: 1 - tolerations: - - key: "agones.dev/agones-system" - operator: "Equal" - value: "true" - effect: "NoExecute" - affinity: - nodeAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - preference: - matchExpressions: - - key: agones.dev/agones-system - operator: Exists - replicas: 3 - http: - port: 443 - serviceType: NodePort - generateTLS: true - image: - registry: gcr.io/agones-images - tag: 1.17.0 - controller: - name: agones-controller - pullPolicy: IfNotPresent - sdk: - name: agones-sdk - cpuRequest: 30m - cpuLimit: 0 - memoryRequest: 0 - memoryLimit: 0 - alwaysPull: false - ping: - name: agones-ping - pullPolicy: IfNotPresent - allocator: - name: agones-allocator - pullPolicy: IfNotPresent - - -gameservers: - namespaces: - - default - minPort: 7000 - maxPort: 8000 diff --git a/packages/ops/configs/aws-auth-template.yml b/packages/ops/configs/aws-auth-template.yml deleted file mode 100644 index 124294f222..0000000000 --- a/packages/ops/configs/aws-auth-template.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Please edit the object below. Lines beginning with a '#' will be ignored, -# and an empty file will abort the edit. If an error occurs while saving this file will be -# reopened with the relevant failures. -# -apiVersion: v1 -data: - mapRoles: | - - groups: - - system:bootstrappers - - system:nodes - rolearn: - username: system:node:{{EC2PrivateDNSName}} - mapUsers: | - - groups: - - system:masters - userarn: arn:aws:iam:::user/ - username: -kind: ConfigMap -metadata: - name: aws-auth - namespace: kube-system diff --git a/packages/ops/configs/db-refresh-false.values.yaml b/packages/ops/configs/db-refresh-false.values.yaml deleted file mode 100644 index f2463b3343..0000000000 --- a/packages/ops/configs/db-refresh-false.values.yaml +++ /dev/null @@ -1,6 +0,0 @@ -api: - extraEnv: - FORCE_DB_REFRESH: "false" -media: - extraEnv: - FORCE_DB_REFRESH: "false" \ No newline at end of file diff --git a/packages/ops/configs/db-refresh-true.values.yaml b/packages/ops/configs/db-refresh-true.values.yaml deleted file mode 100644 index 00386ea407..0000000000 --- a/packages/ops/configs/db-refresh-true.values.yaml +++ /dev/null @@ -1,6 +0,0 @@ -api: - extraEnv: - FORCE_DB_REFRESH: "true" -media: - extraEnv: - FORCE_DB_REFRESH: "true" \ No newline at end of file diff --git a/packages/ops/configs/dev.template.values.yaml b/packages/ops/configs/dev.template.values.yaml deleted file mode 100644 index e9ade1f372..0000000000 --- a/packages/ops/configs/dev.template.values.yaml +++ /dev/null @@ -1,419 +0,0 @@ -client: - extraEnv: - APP_ENV: production - HOST_PORT: "3000" - NODE_ENV: production - SITE_DESC: Connected Worlds for Everyone - SITE_TITLE: Ethereal Engine - image: - repository: - pullPolicy: IfNotPresent - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-1 - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - hosts: - - host: dev. - paths: - - / - replicaCount: 1 - service: - type: NodePort -domain: -sql: - database: - password: - user: - host: - port: 3306 -rts: - extraEnv: - NAF_LISTEN_PORT: "8081" -api: - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources. - sns: - access_key_id: - application_id: - region: us-east-1 - secret_access_key: - sender_id: - host: https://dev./ - extraEnv: - APP_ENV: production - APP_HOST: dev. - APP_URL: https://dev. - AUTH_SECRET: - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: us-east-1 - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: - CERT: certs/cert.pem - KEY: certs/key.pem - DISCORD_CALLBACK_URL: https://dev./auth/oauth/discord - DISCORD_CLIENT_ID: "" - DISCORD_CLIENT_SECRET: "/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - INSTANCESERVER_DOMAIN: instanceserver-dev. - GITHUB_APP_ID: "" - GITHUB_CALLBACK_URL: https://dev./auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https://dev./auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - LINKEDIN_CALLBACK_URL: https://dev.etherealengine.com/auth/oauth/linkedin - LINKEDIN_CLIENT_ID: "" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login. - SERVER_HOST: "api-dev." - SERVER_MODE: "api" - SERVER_PORT: "3030" - SMTP_FROM_EMAIL: info@login. - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources. - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: us-east-1 - STORAGE_S3_STATIC_RESOURCE_BUCKET: - STORAGE_S3_AVATAR_DIRECTORY: avatars - TWITTER_CALLBACK_URL: https://dev.etherealengine.com/auth/oauth/twitter - TWITTER_CLIENT_ID: "" - TWITTER_CLIENT_SECRET: "" - DEFAULT_AVATAR_ID: Allison - AVATAR_FILE_ALLOWED_EXTENSIONS: ".glb,.gltf,.vrm,.fbx" - MIN_AVATAR_FILE_SIZE: "0" - MAX_AVATAR_FILE_SIZE: "15728640" - MIN_THUMBNAIL_FILE_SIZE: "0" - MAX_THUMBNAIL_FILE_SIZE: "2097152" - STORAGE_S3_DEV_MODE: dev - PRESIGNED_URL_EXPIRATION_DURATION: "3600" - image: - repository: - service: - type: NodePort - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-1 - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/enable-cors: "false" - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /cors-proxy/(.*) { - proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_hide_header Access-Control-Allow-Origin; - proxy_ssl_session_reuse off; - proxy_ssl_server_name on; - add_header Access-Control-Allow-Origin $http_origin; - proxy_intercept_errors on; - error_page 301 302 307 = @handle_redirects; - proxy_pass https://$1?$args; - } - - location @handle_redirects { - set $saved_redirect_location '$upstream_http_location'; - proxy_pass_request_headers on; - proxy_hide_header Access-Control-Allow-Origin; - add_header Access-Control-Allow-Origin "$http_origin"; - proxy_pass $saved_redirect_location; - } - hosts: - - host: api-dev. - paths: - - / - replicaCount: 2 - -release: - name: dev - -media: - enabled: false - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources. - sns: - access_key_id: - application_id: - region: us-east-1 - secret_access_key: - sender_id: - host: https://dev./ - extraEnv: - APP_ENV: production - APP_HOST: dev. - APP_URL: https://dev. - AUTH_SECRET: - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: us-east-1 - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: - DISCORD_CALLBACK_URL: https://dev.etherealengine.com/auth/oauth/discord - DISCORD_CLIENT_ID: "" - DISCORD_CLIENT_SECRET: "/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - GITHUB_CALLBACK_URL: https://dev./auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https://dev./auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login. - SERVER_HOST: "api-dev." - SMTP_FROM_EMAIL: info@login. - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources. - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: us-east-1 - STORAGE_S3_STATIC_RESOURCE_BUCKET: - image: - repository: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-1 - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: https://dev. - nginx.ingress.kubernetes.io/proxy-body-size: 256m - hosts: - - host: api-dev. - paths: - - /video - service: - type: NodePort - -instanceserver: - image: - repository: - pullPolicy: IfNotPresent - extraEnv: - APP_ENV: production - APP_HOST: dev. - AUTH_SECRET: - APP_URL: https://dev. - ROUTE53_ACCESS_KEY_ID: - ROUTE53_ACCESS_KEY_SECRET: - ROUTE53_HOSTED_ZONE_ID: - RTC_START_PORT: "40000" - RTC_END_PORT: "40099" - RTC_PORT_BLOCK_SIZE: "100" - INSTANCESERVER_DOMAIN: instanceserver-dev. - INSTANCESERVER_PORT: "3031" - INSTANCESERVER_MODE: "realtime" - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources. - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: us-east-1 - STORAGE_S3_STATIC_RESOURCE_BUCKET: - CERT: certs/cert.pem - KEY: certs/key.pem - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/enable-cors: "false" - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /primus?$ { - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real-IP $remote_addr; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_pass http://$arg_address:$arg_port/primus?$args; - } - host: instanceserver-dev. - resources: - limits: - cpu: "2" - requests: - cpu: "1.5" - buffer: - bufferSize: 2 - minReplicas: 4 - maxReplicas: 24 - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-instanceservers-1 - -testbot: - enabled: false - extraEnv: - APP_HOST: dev. - image: - repository: - pullPolicy: IfNotPresent - - service: - type: ClusterIP - port: 3030 - - serviceAccount: - create: true - annotations: {} - name: - -redis: - enabled: false - -taskserver: - enabled: false - name: xrengine-taskserver - replicaCount: 1 - image: - repository: - pullPolicy: IfNotPresent - extraEnv: - TASKSERVER_PORT: "3030" - TASKSERVER_PROCESS_INTERVAL: "10000" - AUTH_SECRET: - STORAGE_S3_REGION: us-east-1 - STORAGE_S3_STATIC_RESOURCE_BUCKET: - STORAGE_S3_AVATAR_DIRECTORY: avatars - - - service: - type: ClusterIP - port: 3030 - - serviceAccount: - create: true - annotations: {} - name: - - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-1 - -builder: - extraEnv: - NODE_ENV: production - RELEASE_NAME: - AWS_ACCESS_KEY: - AWS_SECRET: - AWS_REGION: - CLUSTER_NAME: - ECR_URL: - REPO_NAME: - DOCKER_LABEL: - PRIVATE_ECR: "false" - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - STORAGE_S3_AVATAR_DIRECTORY: avatars - VITE_APP_HOST: dev. - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api-dev. - VITE_SERVER_PORT: "3030" - VITE_FILE_SERVER: https:// - VITE_INSTANCESERVER_HOST: instanceserver-dev. - VITE_INSTANCESERVER_PORT: "3031" - VITE_ROOT_REDIRECT: "false" - VITE_READY_PLAYER_ME_URL: https://xre.readyplayer.me - VITE_FEATHERS_STORE_KEY: EtherealEngine-Auth-Store - VITE_GA_MEASUREMENT_ID: - VITE_MAPBOX_API_KEY: - VITE_MEDIATOR_SERVER: https://authn.io - VITE_ETH_MARKETPLACE: - image: - repository: /xrengine-dev-builder - service: - type: NodePort - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng--builder-1 - replicaCount: 1 diff --git a/packages/ops/configs/local.matchmaking.template.values.yaml b/packages/ops/configs/local.matchmaking.template.values.yaml deleted file mode 100644 index 1ea83de408..0000000000 --- a/packages/ops/configs/local.matchmaking.template.values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -director: - image: - repository: xrengine-matchmaking-director - pullPolicy: IfNotPresent - -matchfunction: - labels: - app: xrengine-matchmaking - component: matchfunction - selectorLabels: - app: xrengine-matchmaking - component: matchfunction - image: - repository: xrengine-matchmaking-matchfunction - pullPolicy: IfNotPresent - -release: - name: local \ No newline at end of file diff --git a/packages/ops/configs/local.microk8s.template.values.yaml b/packages/ops/configs/local.microk8s.template.values.yaml deleted file mode 100644 index 6bb10633bb..0000000000 --- a/packages/ops/configs/local.microk8s.template.values.yaml +++ /dev/null @@ -1,341 +0,0 @@ -client: - extraEnv: - APP_LOGO: "./logo.svg" - APP_TITLE: EtherealEngine - HOST_PORT: "3000" - NODE_ENV: production - SITE_DESC: Connected Worlds for Everyone - SITE_TITLE: Ethereal Engine - VITE_APP_HOST: local.etherealengine.com - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api-local.etherealengine.com - VITE_SERVER_PORT: "3030" - VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com - VITE_INSTANCESERVER_PORT: "3031" - image: - repository: localhost:32000/xrengine - pullPolicy: IfNotPresent - ingress: - annotations: - kubernetes.io/ingress.class: public - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - hosts: - - host: local.etherealengine.com - paths: - - / - service: - type: NodePort -domain: etherealengine.com -clusterType: microk8s -sql: - database: xrengine - password: password - user: server - host: 10.0.1.1 - port: 3304 -rts: - extraEnv: - NAF_LISTEN_PORT: "8081" -api: - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources.etherealengine.com - sns: - access_key_id: - application_id: - region: - secret_access_key: - sender_id: - host: https://local.etherealengine.com/ - extraEnv: - APP_HOST: local.etherealengine.com - APP_URL: https://local.etherealengine.com - AUTH_SECRET: - ELASTIC_HOST: "http://10.0.1.1:9200" - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: arn:aws:sns::: - CERT: certs/cert.pem - KEY: certs/key.pem - CORS_SERVER_PORT: "3036" - FACEBOOK_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com - GITHUB_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - LOCAL: "true" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login.etherealengine.com - SERVE_CLIENT_FROM_STORAGE_PROVIDER: "true" - SERVER_HOST: "api-local.etherealengine.com" - SERVER_MODE: "api" - SERVER_PORT: "3030" - SMTP_FROM_EMAIL: info@login.etherealengine.com - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: local - LOCAL_STORAGE_PROVIDER: "localhost:8642" - LOCAL_STORAGE_PROVIDER_PORT: "8642" - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - VITE_APP_HOST: local.etherealengine.com - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api-local.etherealengine.com - VITE_SERVER_PORT: "3030" - VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com - VITE_INSTANCESERVER_PORT: "3031" - USE_IPFS: "true" - image: - repository: localhost:32000/xrengine - pullPolicy: IfNotPresent - ingress: - annotations: - kubernetes.io/ingress.class: public - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/enable-cors: "false" -# nginx.ingress.kubernetes.io/cors-allow-origin: https://local.etherealengine.com - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /cors-proxy/(.*) { - proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_hide_header Access-Control-Allow-Origin; - proxy_ssl_session_reuse off; - add_header Initial-Reverse "first"; - proxy_ssl_server_name on; - add_header Access-Control-Allow-Origin $http_origin; - proxy_intercept_errors on; - error_page 301 302 307 = @handle_redirects; - proxy_pass https://$1?$args; - } - - location @handle_redirects { - set $saved_redirect_location '$upstream_http_location'; - proxy_pass_request_headers on; - add_header Redirect-Reverse "second"; - proxy_hide_header Access-Control-Allow-Origin; - add_header Access-Control-Allow-Origin $http_origin; - proxy_pass $saved_redirect_location; - } - hosts: - - host: api-local.etherealengine.com - paths: - - / - - fileServer: - # This is the path of file server upload folder in your host machine. - # For microk8s it will be similar to '/home///packages/server/upload' - # or '/packages/server/upload' - hostUploadFolder: - - service: - type: NodePort - corsServerPort: 3036 - replicaCount: 1 - -media: - enabled: false - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources.etherealengine.com - sns: - access_key_id: - application_id: - region: - secret_access_key: - sender_id: - host: https://local.etherealengine.com/ - extraEnv: - APP_HOST: local.etherealengine.com - APP_URL: https://local.etherealengine.com - AUTH_SECRET: - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: arn:aws:sns::: - CERT: certs/cert.pem - KEY: certs/key.pem - CORS_SERVER_PORT: "3036" - FACEBOOK_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com - GITHUB_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - LOCAL: "true" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login.etherealengine.com - SERVER_HOST: "api-local.etherealengine.com" - SERVER_PORT: "3030" - SMTP_FROM_EMAIL: info@login.etherealengine.com - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: local - LOCAL_STORAGE_PROVIDER: "localhost:8642" - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - image: - repository: localhost:32000/xrengine - pullPolicy: IfNotPresent - ingress: - annotations: - kubernetes.io/ingress.class: public - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: https://local.etherealengine.com - nginx.ingress.kubernetes.io/proxy-body-size: 5m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - hosts: - - host: api-local.etherealengine.com - paths: - - /video - service: - type: NodePort - -release: - name: "local" - -instanceserver: - image: - repository: localhost:32000/xrengine - pullPolicy: IfNotPresent - extraEnv: - APP_HOST: local.etherealengine.com - AUTH_SECRET: - APP_URL: https://local.etherealengine.com - CERT: certs/cert.pem - KEY: certs/key.pem - INSTANCESERVER_PORT: "3031" - ROUTE53_ACCESS_KEY_ID: - ROUTE53_ACCESS_KEY_SECRET: - ROUTE53_HOSTED_ZONE_ID: - RTC_START_PORT: "40000" - RTC_END_PORT: "40099" - RTC_PORT_BLOCK_SIZE: "100" - LOCAL: "true" - INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com - INSTANCESERVER_MODE: "realtime" - STORAGE_PROVIDER: local - LOCAL_STORAGE_PROVIDER: "localhost:8642" - LOCAL_STORAGE_PROVIDER_PORT: "8642" - NODE_TLS_REJECT_UNAUTHORIZED: "0" - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - TS_NODE_IGNORE: (?:^|\/)node_modules\/(?!(@xrengine)) - ingress: - disabled: false - host: instanceserver-local.etherealengine.com - annotations: - kubernetes.io/ingress.class: public - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/enable-cors: "false" - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /primus?$ { - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real-IP $remote_addr; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_pass http://$arg_address:$arg_port/primus?$args; - } - buffer: - bufferSize: 2 - minReplicas: 2 - maxReplicas: 10 - -builder: - extraEnv: - NODE_ENV: production - RELEASE_NAME: - AWS_ACCESS_KEY: - AWS_SECRET: - AWS_REGION: - CLUSTER_NAME: - ECR_URL: - REPO_NAME: - DOCKER_LABEL: - PRIVATE_ECR: "false" - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - STORAGE_S3_AVATAR_DIRECTORY: avatars - VITE_APP_HOST: local.etherealengine.com - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api-local.etherealengine.com - VITE_SERVER_PORT: "3030" - VITE_FILE_SERVER: https:// - VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com - VITE_INSTANCESERVER_PORT: "3031" - VITE_ROOT_REDIRECT: "false" - VITE_READY_PLAYER_ME_URL: https://xre.readyplayer.me - VITE_FEATHERS_STORE_KEY: EtherealEngine-Auth-Store - VITE_GA_MEASUREMENT_ID: - VITE_MAPBOX_API_KEY: - VITE_MEDIATOR_SERVER: https://authn.io - VITE_ETH_MARKETPLACE: - image: - repository: lagunalabs/xrengine-builder - service: - type: NodePort - replicaCount: 1 - -testbot: - extraEnv: - APP_HOST: local.etherealengine.com - image: - repository: localhost:32000/xrengine-testbot - pullPolicy: IfNotPresent \ No newline at end of file diff --git a/packages/ops/configs/local.minikube.template.values.yaml b/packages/ops/configs/local.minikube.template.values.yaml deleted file mode 100644 index 48cff21b70..0000000000 --- a/packages/ops/configs/local.minikube.template.values.yaml +++ /dev/null @@ -1,342 +0,0 @@ -client: - extraEnv: - APP_LOGO: "./logo.svg" - APP_TITLE: EtherealEngine - HOST_PORT: "3000" - NODE_ENV: production - SITE_DESC: Connected Worlds for Everyone - SITE_TITLE: Ethereal Engine - VITE_APP_HOST: local.etherealengine.com - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api-local.etherealengine.com - VITE_SERVER_PORT: "3030" - VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com - VITE_INSTANCESERVER_PORT: "3031" - image: - repository: xrengine - pullPolicy: IfNotPresent - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - hosts: - - host: local.etherealengine.com - paths: - - / - service: - type: NodePort -domain: etherealengine.com -clusterType: minikube -sql: - database: xrengine - password: password - user: server - host: host.minikube.internal - port: 3304 -rts: - extraEnv: - NAF_LISTEN_PORT: "8081" -api: - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources.etherealengine.com - sns: - access_key_id: - application_id: - region: - secret_access_key: - sender_id: - host: https://local.etherealengine.com/ - extraEnv: - APP_HOST: local.etherealengine.com - APP_URL: https://local.etherealengine.com - AUTH_SECRET: - ELASTIC_HOST: "http://host.minikube.internal:9200" - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: arn:aws:sns::: - CERT: certs/cert.pem - KEY: certs/key.pem - CORS_SERVER_PORT: "3036" - FACEBOOK_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com - GITHUB_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - LOCAL: "true" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login.etherealengine.com - SERVE_CLIENT_FROM_STORAGE_PROVIDER: "true" - SERVER_HOST: "api-local.etherealengine.com" - SERVER_MODE: "api" - SERVER_PORT: "3030" - SMTP_FROM_EMAIL: info@login.etherealengine.com - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: local - LOCAL_STORAGE_PROVIDER: "localhost:8642" - LOCAL_STORAGE_PROVIDER_PORT: "8642" - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - VITE_APP_HOST: local.etherealengine.com - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api-local.etherealengine.com - VITE_SERVER_PORT: "3030" - VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com - VITE_INSTANCESERVER_PORT: "3031" - USE_IPFS: "true" - image: - repository: xrengine - pullPolicy: IfNotPresent - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/enable-cors: "false" -# nginx.ingress.kubernetes.io/cors-allow-origin: https://local.etherealengine.com - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /cors-proxy/(.*) { - proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_hide_header Access-Control-Allow-Origin; - proxy_ssl_session_reuse off; - add_header Initial-Reverse "first"; - proxy_ssl_server_name on; - add_header Access-Control-Allow-Origin $http_origin; - proxy_intercept_errors on; - error_page 301 302 307 = @handle_redirects; - proxy_pass https://$1?$args; - } - - location @handle_redirects { - set $saved_redirect_location '$upstream_http_location'; - proxy_pass_request_headers on; - add_header Redirect-Reverse "second"; - proxy_hide_header Access-Control-Allow-Origin; - add_header Access-Control-Allow-Origin $http_origin; - proxy_pass $saved_redirect_location; - } - hosts: - - host: api-local.etherealengine.com - paths: - - / - - fileServer: - # This is the path of file server upload folder in your host machine. - # For minikube it will be similar to '/hosthome///packages/server/upload' - # The folder must be in home folder and make sure to use /hosthome/ instead of home in path. - # Ref: https://stackoverflow.com/a/48535001/2077741 - hostUploadFolder: - - service: - type: NodePort - corsServerPort: 3036 - replicaCount: 1 - -media: - enabled: false - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources.etherealengine.com - sns: - access_key_id: - application_id: - region: - secret_access_key: - sender_id: - host: https://local.etherealengine.com/ - extraEnv: - APP_HOST: local.etherealengine.com - APP_URL: https://local.etherealengine.com - AUTH_SECRET: - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: arn:aws:sns::: - CERT: certs/cert.pem - KEY: certs/key.pem - CORS_SERVER_PORT: "3036" - FACEBOOK_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com - GITHUB_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - LOCAL: "true" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login.etherealengine.com - SERVER_HOST: "api-local.etherealengine.com" - SERVER_PORT: "3030" - SMTP_FROM_EMAIL: info@login.etherealengine.com - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: local - LOCAL_STORAGE_PROVIDER: "localhost:8642" - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - image: - repository: xrengine - pullPolicy: IfNotPresent - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: https://local.etherealengine.com - nginx.ingress.kubernetes.io/proxy-body-size: 5m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - hosts: - - host: api-local.etherealengine.com - paths: - - /video - service: - type: NodePort - -release: - name: "local" - -instanceserver: - image: - repository: xrengine - pullPolicy: IfNotPresent - extraEnv: - APP_HOST: local.etherealengine.com - AUTH_SECRET: - APP_URL: https://local.etherealengine.com - CERT: certs/cert.pem - KEY: certs/key.pem - INSTANCESERVER_PORT: "3031" - ROUTE53_ACCESS_KEY_ID: - ROUTE53_ACCESS_KEY_SECRET: - ROUTE53_HOSTED_ZONE_ID: - RTC_START_PORT: "40000" - RTC_END_PORT: "40099" - RTC_PORT_BLOCK_SIZE: "100" - LOCAL: "true" - INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com - INSTANCESERVER_MODE: "realtime" - STORAGE_PROVIDER: local - LOCAL_STORAGE_PROVIDER: "localhost:8642" - LOCAL_STORAGE_PROVIDER_PORT: "8642" - NODE_TLS_REJECT_UNAUTHORIZED: "0" - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - TS_NODE_IGNORE: (?:^|\/)node_modules\/(?!(@xrengine)) - ingress: - disabled: false - host: instanceserver-local.etherealengine.com - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/enable-cors: "false" - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /primus?$ { - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real-IP $remote_addr; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_pass http://$arg_address:$arg_port/primus?$args; - } - buffer: - bufferSize: 2 - minReplicas: 2 - maxReplicas: 10 - -builder: - extraEnv: - NODE_ENV: production - RELEASE_NAME: - AWS_ACCESS_KEY: - AWS_SECRET: - AWS_REGION: - CLUSTER_NAME: - ECR_URL: - REPO_NAME: - DOCKER_LABEL: - PRIVATE_ECR: "false" - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - STORAGE_S3_AVATAR_DIRECTORY: avatars - VITE_APP_HOST: local.etherealengine.com - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api-local.etherealengine.com - VITE_SERVER_PORT: "3030" - VITE_FILE_SERVER: https:// - VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com - VITE_INSTANCESERVER_PORT: "3031" - VITE_ROOT_REDIRECT: "false" - VITE_READY_PLAYER_ME_URL: https://xre.readyplayer.me - VITE_FEATHERS_STORE_KEY: EtherealEngine-Auth-Store - VITE_GA_MEASUREMENT_ID: - VITE_MAPBOX_API_KEY: - VITE_MEDIATOR_SERVER: https://authn.io - VITE_ETH_MARKETPLACE: - image: - repository: lagunalabs/xrengine-builder - service: - type: NodePort - replicaCount: 1 - -testbot: - extraEnv: - APP_HOST: local.etherealengine.com - image: - repository: xrengine-testbot - pullPolicy: IfNotPresent \ No newline at end of file diff --git a/packages/ops/configs/nginx-ingress-aws-values.yml b/packages/ops/configs/nginx-ingress-aws-values.yml deleted file mode 100755 index d96a98782d..0000000000 --- a/packages/ops/configs/nginx-ingress-aws-values.yml +++ /dev/null @@ -1,30 +0,0 @@ -# values for nginx-ingress on EKS using Network Load Balancer - -rbac: - create: true - -controller: - config: - ssl-redirect: "false" - server-snippet: | - listen 8000; - if ( $server_port = 80 ) { - return 308 https://$host$request_uri; - } - containerPort: - http: 80 - https: 443 - special: 8000 - service: - targetPorts: - http: http - https: special # SSL termination at the load balancer - annotations: - meta.helm.sh/release-name: nginx - meta.helm.sh/release-namespace: default - service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: "Name=theoverlay" - service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "tcp" - service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "https" - service.beta.kubernetes.io/aws-load-balancer-type: "nlb" - service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "" - diff --git a/packages/ops/configs/prod.template.values.yaml b/packages/ops/configs/prod.template.values.yaml deleted file mode 100644 index a87c8d3d11..0000000000 --- a/packages/ops/configs/prod.template.values.yaml +++ /dev/null @@ -1,381 +0,0 @@ -client: - extraEnv: - APP_ENV: production - HOST_PORT: "3000" - NODE_ENV: production - SITE_DESC: Connected Worlds for Everyone - SITE_TITLE: Ethereal Engine - image: - repository: - pullPolicy: IfNotPresent - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-1 - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - hosts: - - host: - paths: - - / - replicaCount: 1 - service: - type: NodePort -domain: -sql: - database: - password: - user: - host: - port: 3306 -rts: - extraEnv: - NAF_LISTEN_PORT: "8081" -api: - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources. - sns: - access_key_id: - application_id: - region: us-east-1 - secret_access_key: - sender_id: - host: https:/// - extraEnv: - APP_ENV: production - APP_HOST: https:// - APP_URL: https:// - AUTH_SECRET: - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: us-east-1 - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: - CERT: certs/cert.pem - KEY: certs/key.pem - DISCORD_CALLBACK_URL: https:///auth/oauth/discord - DISCORD_CLIENT_ID: "" - DISCORD_CLIENT_SECRET: "/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - INSTANCESERVER_DOMAIN: instanceserver. - GITHUB_APP_ID: "" - GITHUB_CALLBACK_URL: https:///auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https:///auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - LINKEDIN_CALLBACK_URL: https:///auth/oauth/linkedin - LINKEDIN_CLIENT_ID: "" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login. - SERVER_HOST: "api." - SERVER_MODE: "api" - SERVER_PORT: "3030" - SMTP_FROM_EMAIL: info@login. - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources. - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: us-east-1 - STORAGE_S3_STATIC_RESOURCE_BUCKET: - STORAGE_S3_AVATAR_DIRECTORY: avatars - TWITTER_CALLBACK_URL: https:///auth/oauth/twitter - TWITTER_CLIENT_ID: "" - TWITTER_CLIENT_SECRET: "" - DEFAULT_AVATAR_ID: Allison - AVATAR_FILE_ALLOWED_EXTENSIONS: ".glb,.gltf,.vrm,.fbx" - MIN_AVATAR_FILE_SIZE: "0" - MAX_AVATAR_FILE_SIZE: "15728640" - MIN_THUMBNAIL_FILE_SIZE: "0" - MAX_THUMBNAIL_FILE_SIZE: "2097152" - STORAGE_S3_DEV_MODE: dev - PRESIGNED_URL_EXPIRATION_DURATION: "3600" - image: - repository: - service: - type: NodePort - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-1 - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/enable-cors: "false" - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /cors-proxy/(.*) { - proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_hide_header Access-Control-Allow-Origin; - proxy_ssl_session_reuse off; - proxy_ssl_server_name on; - add_header Access-Control-Allow-Origin $http_origin; - proxy_intercept_errors on; - error_page 301 302 307 = @handle_redirects; - proxy_pass https://$1?$args; - } - - location @handle_redirects { - set $saved_redirect_location '$upstream_http_location'; - proxy_pass_request_headers on; - proxy_hide_header Access-Control-Allow-Origin; - add_header Access-Control-Allow-Origin "$http_origin"; - proxy_pass $saved_redirect_location; - } - hosts: - - host: api. - paths: - - / - replicaCount: 2 - -release: - name: prod - -media: - enabled: false - config: - aws: - keys: - access_key_id: - secret_access_key: - s3: - region: us-east-1 - static_resource_bucket: - cloudfront: - domain: resources. - sns: - access_key_id: - application_id: - region: us-east-1 - secret_access_key: - sender_id: - host: https:/// - extraEnv: - APP_ENV: production - APP_HOST: - APP_URL: https:// - AUTH_SECRET: - AWS_SMS_ACCESS_KEY_ID: - AWS_SMS_REGION: us-east-1 - AWS_SMS_SECRET_ACCESS_KEY: - AWS_SMS_TOPIC_ARN: - DISCORD_CALLBACK_URL: https://dev./auth/oauth/discord - DISCORD_CLIENT_ID: "" - DISCORD_CLIENT_SECRET: "/auth/oauth/facebook - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FORCE_DB_REFRESH: "false" - GITHUB_CALLBACK_URL: https:///auth/oauth/github - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: https:///auth/oauth/google - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - MAGICLINK_EMAIL_SUBJECT: Login to Ethereal Engine - MAIL_FROM: info@login. - SERVER_HOST: "api." - SMTP_FROM_EMAIL: info@login. - SMTP_FROM_NAME: noreply - SMTP_HOST: email-smtp..amazonaws.com - SMTP_PASS: - SMTP_PORT: "465" - SMTP_SECURE: "true" - SMTP_USER: - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources. - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: us-east-1 - STORAGE_S3_STATIC_RESOURCE_BUCKET: - image: - repository: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-1 - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: https:// - nginx.ingress.kubernetes.io/proxy-body-size: 256m - hosts: - - host: api. - paths: - - /video - service: - type: NodePort - -instanceserver: - image: - repository: - pullPolicy: IfNotPresent - extraEnv: - APP_ENV: production - APP_HOST: - AUTH_SECRET: - APP_URL: https:// - ROUTE53_ACCESS_KEY_ID: - ROUTE53_ACCESS_KEY_SECRET: - ROUTE53_HOSTED_ZONE_ID: - RTC_START_PORT: "40000" - RTC_END_PORT: "40099" - RTC_PORT_BLOCK_SIZE: "100" - INSTANCESERVER_DOMAIN: instanceserver. - INSTANCESERVER_MODE: "realtime" - INSTANCESERVER_PORT: "3031" - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: resources. - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: us-east-1 - STORAGE_S3_STATIC_RESOURCE_BUCKET: - CERT: certs/cert.pem - KEY: certs/key.pem - ingress: - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/force-ssl-redirect: "false" - nginx.ingress.kubernetes.io/enable-cors: "false" - nginx.ingress.kubernetes.io/proxy-body-size: 256m - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/affinity-mode: persistent - nginx.ingress.kubernetes.io/server-snippet: | - location ~* /primus?$ { - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real-IP $remote_addr; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_pass http://$arg_address:$arg_port/primus?$args; - } - host: instanceserver. - resources: - limits: - cpu: "2" - requests: - cpu: "1.5" - buffer: - bufferSize: 4 - minReplicas: 4 - maxReplicas: 24 - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-instanceservers-1 - -testbot: - enabled: false - extraEnv: - APP_HOST: dev. - image: - repository: - pullPolicy: IfNotPresent - - service: - type: ClusterIP - port: 3030 - - serviceAccount: - create: true - annotations: {} - name: - -builder: - extraEnv: - NODE_ENV: production - RELEASE_NAME: - AWS_ACCESS_KEY: - AWS_SECRET: - AWS_REGION: - CLUSTER_NAME: - ECR_URL: - REPO_NAME: - DOCKER_LABEL: - PRIVATE_ECR: "false" - STORAGE_PROVIDER: aws - STORAGE_AWS_ACCESS_KEY_ID: - STORAGE_AWS_ACCESS_KEY_SECRET: - STORAGE_CLOUDFRONT_DOMAIN: - STORAGE_CLOUDFRONT_DISTRIBUTION_ID: - STORAGE_S3_REGION: - STORAGE_S3_STATIC_RESOURCE_BUCKET: - STORAGE_S3_AVATAR_DIRECTORY: avatars - VITE_APP_HOST: app. - VITE_APP_PORT: "3000" - VITE_SERVER_HOST: api. - VITE_SERVER_PORT: "3030" - VITE_FILE_SERVER: https:// - VITE_INSTANCESERVER_HOST: instanceserver. - VITE_INSTANCESERVER_PORT: "3031" - VITE_ROOT_REDIRECT: "false" - VITE_READY_PLAYER_ME_URL: https://xre.readyplayer.me - VITE_FEATHERS_STORE_KEY: EtherealEngine-Auth-Store - VITE_GA_MEASUREMENT_ID: - VITE_MAPBOX_API_KEY: - VITE_MEDIATOR_SERVER: https://authn.io - VITE_ETH_MARKETPLACE: - image: - repository: /xrengine-dev-builder - service: - type: NodePort - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng--builder-1 - replicaCount: 1 diff --git a/packages/ops/configs/redis-values.yaml b/packages/ops/configs/redis-values.yaml deleted file mode 100755 index e6210709eb..0000000000 --- a/packages/ops/configs/redis-values.yaml +++ /dev/null @@ -1,20 +0,0 @@ -master: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-redis-1 -replica: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/nodegroup - operator: In - values: - - ng-redis-1 \ No newline at end of file diff --git a/packages/ops/docker-compose-local.yml b/packages/ops/docker-compose-local.yml deleted file mode 100755 index e1c973ace0..0000000000 --- a/packages/ops/docker-compose-local.yml +++ /dev/null @@ -1,60 +0,0 @@ -version: '2.3' -services: - rts: #xrengine-realtime-server - build: - context: ../xrsocial-realtime-server - image: xrengine/realtime-server - restart: always - environment: - NAF_LISTEN_PORT: 8081 - ports: - - '8081:8081' - - '9229:9229' - - server: - build: - context: ../xrsocial - image: xrengine/server - restart: always - environment: - PORT: 3030 - # take care, db not 127.0.0.1, because compose uses an intenal DNS - MYSQL_URL: mysql://server:password@db:3306/xrengine - ports: - - '3030:3030' - depends_on: - - db - - client: - build: - context: ../xrsocial-client - image: xrengine/client - environment: - SITE_TITLE: Ethereal Engine - SITE_DESC: Connected Worlds for Everyone - APP_ENV: dev - restart: always - ports: - - '3000:3000' - - # DB Server - db: - image: mariadb:10.7 - restart: always - environment: - MYSQL_ROOT_PASSWORD: xrengine-root-pa$$w0rd - MYSQL_DATABASE: xrengine - MYSQL_USER: server - MYSQL_PASSWORD: password - ports: - - '3306:3306' - - - # lets you view the database - adminer: - image: adminer - restart: always - ports: - - "8080:8080" - depends_on: - - db diff --git a/packages/ops/docker-compose.yml b/packages/ops/docker-compose.yml deleted file mode 100755 index b726c29e45..0000000000 --- a/packages/ops/docker-compose.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: '2.3' -services: - rts: #xrengine-realtime-server - image: xrengine/realtime-server - restart: always - environment: - NAF_LISTEN_PORT: 8081 - ports: - - '8081:8081' - - server: - image: xrengine/server - restart: always - environment: - PORT: 3030 - # take care, db not 127.0.0.1, because compose uses an intenal DNS - MYSQL_URL: mysql://server:password@db:3306/xrengine - ports: - - '3030:3030' - depends_on: - - db - - client: - image: xrengine/client - restart: always - ports: - - '3000:3000' - - # DB Server - db: - image: mariadb:10.7 - restart: always - environment: - MYSQL_ROOT_PASSWORD: xrengine-root-pa$$w0rd - MYSQL_DATABASE: xrengine - MYSQL_USER: server - MYSQL_PASSWORD: password - ports: - - '3306:3306' - - - # lets you view the database - adminer: - image: adminer - restart: always - ports: - - "8080:8080" - depends_on: - - db diff --git a/packages/ops/install.sh b/packages/ops/install.sh deleted file mode 100755 index eccbd823e1..0000000000 --- a/packages/ops/install.sh +++ /dev/null @@ -1,17 +0,0 @@ -set -e -set -x - -sudo snap install kubectl --classic -sudo snap install helm --classic - -helm repo add nginx-stable https://helm.nginx.com/stable -helm repo add stable https://kubernetes-charts.storage.googleapis.com -helm repo update -helm install nginx1 nginx-stable/nginx-ingress - -aws eks describe-cluster --name xrengine-demo > ~/.kube/xrengine.yaml -export KUBECONFIG=/home/${USER}/.kube/xrengine.yaml -echo $KUBECONFIG - -# get dependencies -helm dep update xrengine diff --git a/packages/ops/ipfs/.helmignore b/packages/ops/ipfs/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/packages/ops/ipfs/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/packages/ops/ipfs/Chart.yaml b/packages/ops/ipfs/Chart.yaml deleted file mode 100644 index a292685975..0000000000 --- a/packages/ops/ipfs/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: ipfs -description: A Helm chart of IPFS by XRFoundation -type: application -appVersion: "1.0.1" - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 diff --git a/packages/ops/ipfs/README.md b/packages/ops/ipfs/README.md deleted file mode 100755 index 15af2195dd..0000000000 --- a/packages/ops/ipfs/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# IPFS - -IPFS charts for [XREngine](https://xrfoundation.io/). - -## Installing the Chart - -Please first update `values.yaml` of charts. - -To install the chart with the release name `my-release`: - -``` bash -cd IPFS_CHARTS_FOLDER -helm install my-release . # Helm 3 -helm install --name my-release . # Helm 2 -``` - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall the `my-release` deployment: - -```console -helm uninstall my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. diff --git a/packages/ops/ipfs/templates/NOTES.txt b/packages/ops/ipfs/templates/NOTES.txt deleted file mode 100644 index cdf80138b6..0000000000 --- a/packages/ops/ipfs/templates/NOTES.txt +++ /dev/null @@ -1,19 +0,0 @@ -Thank you for installing IPFS by XRFoundation - -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "ipfs.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 9095: - echo "Visit your application at above port" -{{- end }} - -We would love to hear your feedback: -- contact us on https://xrfoundation.io/ -- join our Discord on https://discord.gg/xrf - diff --git a/packages/ops/ipfs/templates/_helpers.tpl b/packages/ops/ipfs/templates/_helpers.tpl deleted file mode 100644 index a6b98bb6a6..0000000000 --- a/packages/ops/ipfs/templates/_helpers.tpl +++ /dev/null @@ -1,83 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "ipfs.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "ipfs.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "ipfs.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "ipfs.labels" -}} -helm.sh/chart: {{ include "ipfs.chart" . }} -{{ include "ipfs.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* Returns the configmap env name */}} -{{- define "ipfs.configmapEnvName" -}} -{{ .Release.Name }}-env -{{- end }} - -{{/* Returns the configmap bootstrap name */}} -{{- define "ipfs.configmapBootstrapName" -}} -{{ .Release.Name }}-bootstrap -{{- end }} - -{{/* Returns the storage cluster name */}} -{{- define "ipfs.storageClusterName" -}} -{{ .Release.Name }}-cluster -{{- end }} - -{{/* Returns the storage ipfs name */}} -{{- define "ipfs.storageIpfsName" -}} -{{ .Release.Name }}-ipfs -{{- end }} - - -{{/* -Selector labels -*/}} -{{- define "ipfs.selectorLabels" -}} -app.kubernetes.io/name: {{ include "ipfs.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "ipfs.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "ipfs.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/packages/ops/ipfs/templates/configmap-bootstrap.yaml b/packages/ops/ipfs/templates/configmap-bootstrap.yaml deleted file mode 100644 index 3706b6953a..0000000000 --- a/packages/ops/ipfs/templates/configmap-bootstrap.yaml +++ /dev/null @@ -1,70 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "ipfs.configmapBootstrapName" . }} - labels: - {{- include "ipfs.labels" . | nindent 4 }} -data: - entrypoint.sh: | - #!/bin/sh - user=ipfs - - # This is a custom entrypoint for k8s designed to connect to the bootstrap - # node running in the cluster. It has been set up using a configmap to - # allow changes on the fly. - - if [ ! -f /data/ipfs-cluster/service.json ]; then - ipfs-cluster-service init - fi - - PEER_HOSTNAME=`cat /proc/sys/kernel/hostname` - - grep -q ".*ipfs-cluster-0.*" /proc/sys/kernel/hostname - if [ $? -eq 0 ]; then - CLUSTER_ID=${BOOTSTRAP_PEER_ID} \ - CLUSTER_PRIVATEKEY=${BOOTSTRAP_PEER_PRIV_KEY} \ - exec ipfs-cluster-service daemon --upgrade - else - BOOTSTRAP_ADDR=/dns4/${SVC_NAME}-0.${SVC_NAME}/tcp/9096/ipfs/${BOOTSTRAP_PEER_ID} - - if [ -z $BOOTSTRAP_ADDR ]; then - exit 1 - fi - # Only ipfs user can get here - exec ipfs-cluster-service daemon --upgrade --bootstrap $BOOTSTRAP_ADDR --leave - fi - - configure-ipfs.sh: | - #!/bin/sh - set -e - set -x - user=ipfs - repo=/data/ipfs - # This is a custom entrypoint for k8s designed to run ipfs nodes in an appropriate - # setup for production scenarios. - - mkdir -p /data/ipfs && chown -R ipfs /data/ipfs - - if [ `id -u` -eq 0 ]; then - echo "Changing user to $user" - # ensure folder is writable - su-exec "$user" test -w "$repo" || chown -R -- "$user" "$repo" - # restart script with new privileges - exec su-exec "$user" sh "$0" "$@" - fi - - if [ -f /data/ipfs/config ]; then - if [ -f /data/ipfs/repo.lock ]; then - rm /data/ipfs/repo.lock - fi - exit 0 - fi - - ipfs init --profile=badgerds,server - ipfs config Addresses.API /ip4/0.0.0.0/tcp/5001 - ipfs config Addresses.Gateway /ip4/0.0.0.0/tcp/8080 - ipfs config --json Swarm.ConnMgr.HighWater 2000 - ipfs config --json Datastore.BloomFilterSize 1048576 - ipfs config Datastore.StorageMax 1GB - ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["*"]' - ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "POST"]' diff --git a/packages/ops/ipfs/templates/configmap-env.yaml b/packages/ops/ipfs/templates/configmap-env.yaml deleted file mode 100644 index 3043c3f58f..0000000000 --- a/packages/ops/ipfs/templates/configmap-env.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "ipfs.configmapEnvName" . }} - labels: - {{- include "ipfs.labels" . | nindent 4 }} -data: - bootstrap-peer-id: {{ .Values.bootstrapPeerId }} \ No newline at end of file diff --git a/packages/ops/ipfs/templates/ingress.yaml b/packages/ops/ipfs/templates/ingress.yaml deleted file mode 100644 index 9ecb7c290f..0000000000 --- a/packages/ops/ipfs/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "ipfs.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "ipfs.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/packages/ops/ipfs/templates/secret.yaml b/packages/ops/ipfs/templates/secret.yaml deleted file mode 100644 index 50206943f0..0000000000 --- a/packages/ops/ipfs/templates/secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "ipfs.fullname" . }} - labels: - {{- include "ipfs.labels" . | nindent 4 }} -type: Opaque -data: - cluster-secret: {{ .Values.clusterSecret | b64enc }} - bootstrap-peer-priv-key: {{ .Values.bootstrapPeerPrivateKey | b64enc }} \ No newline at end of file diff --git a/packages/ops/ipfs/templates/service.yaml b/packages/ops/ipfs/templates/service.yaml deleted file mode 100644 index 3ad81f7b3f..0000000000 --- a/packages/ops/ipfs/templates/service.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "ipfs.fullname" . }} - labels: - {{- include "ipfs.labels" . | nindent 4 }} -spec: - type: LoadBalancer - ports: - - name: swarm - targetPort: swarm - port: 4001 - - name: swarm-udp - targetPort: swarm-udp - port: 4002 - - name: ws - targetPort: ws - port: 8081 - - name: http - targetPort: http - port: 8080 - - name: api-http - targetPort: api-http - port: 9094 - - name: proxy-http - targetPort: proxy-http - port: 9095 - - name: cluster-swarm - targetPort: cluster-swarm - port: 9096 - selector: - {{- include "ipfs.selectorLabels" . | nindent 4 }} diff --git a/packages/ops/ipfs/templates/statefulset.yaml b/packages/ops/ipfs/templates/statefulset.yaml deleted file mode 100644 index 15182e17bf..0000000000 --- a/packages/ops/ipfs/templates/statefulset.yaml +++ /dev/null @@ -1,140 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "ipfs.fullname" . }} - labels: - {{- include "ipfs.labels" . | nindent 4 }} -spec: - serviceName: {{ include "ipfs.fullname" . }} - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "ipfs.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "ipfs.selectorLabels" . | nindent 8 }} - spec: - initContainers: - - name: configure-ipfs - image: {{ .Values.ipfsImage.repo }}:{{ .Values.ipfsImage.tag }} - command: ["sh", "/custom/configure-ipfs.sh"] - volumeMounts: - - name: {{ include "ipfs.storageIpfsName" . }} - mountPath: /data/ipfs - - name: configure-script - mountPath: /custom - containers: - - name: ipfs - image: {{ .Values.ipfsImage.repo }}:{{ .Values.ipfsImage.tag }} - imagePullPolicy: IfNotPresent - env: - - name: IPFS_FD_MAX - value: "4096" - ports: - - name: swarm - protocol: TCP - containerPort: 4001 - - name: swarm-udp - protocol: UDP - containerPort: 4002 - - name: api - protocol: TCP - containerPort: 5001 - - name: ws - protocol: TCP - containerPort: 8081 - - name: http - protocol: TCP - containerPort: 8080 - livenessProbe: - tcpSocket: - port: swarm - initialDelaySeconds: 30 - timeoutSeconds: 5 - periodSeconds: 15 - volumeMounts: - - name: {{ include "ipfs.storageIpfsName" . }} - mountPath: /data/ipfs - - name: configure-script - mountPath: /custom - resources: - {} - - name: ipfs-cluster - image: {{ .Values.ipfsClusterImage.repo }}:{{ .Values.ipfsClusterImage.tag }} - imagePullPolicy: IfNotPresent - command: ["sh", "/custom/entrypoint.sh"] - envFrom: - - configMapRef: - name: {{ include "ipfs.configmapEnvName" . }} - env: - - name: BOOTSTRAP_PEER_ID - valueFrom: - configMapKeyRef: - name: {{ include "ipfs.configmapEnvName" . }} - key: bootstrap-peer-id - - name: BOOTSTRAP_PEER_PRIV_KEY - valueFrom: - secretKeyRef: - name: {{ include "ipfs.fullname" . }} - key: bootstrap-peer-priv-key - - name: CLUSTER_SECRET - valueFrom: - secretKeyRef: - name: {{ include "ipfs.fullname" . }} - key: cluster-secret - - name: CLUSTER_MONITOR_PING_INTERVAL - value: "3m" - - name: SVC_NAME - value: {{ include "ipfs.fullname" . }} - ports: - - name: api-http - containerPort: 9094 - protocol: TCP - - name: proxy-http - containerPort: 9095 - protocol: TCP - - name: cluster-swarm - containerPort: 9096 - protocol: TCP - livenessProbe: - tcpSocket: - port: cluster-swarm - initialDelaySeconds: 5 - timeoutSeconds: 5 - periodSeconds: 10 - volumeMounts: - - name: {{ include "ipfs.storageClusterName" . }} - mountPath: /data/ipfs-cluster - - name: configure-script - mountPath: /custom - resources: - {} - volumes: - - name: configure-script - configMap: - name: {{ include "ipfs.configmapBootstrapName" . }} - - volumeClaimTemplates: - - metadata: - name: {{ include "ipfs.storageClusterName" . }} - spec: - storageClassName: standard - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 1Gi - - metadata: - name: {{ include "ipfs.storageIpfsName" . }} - spec: - storageClassName: standard - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 5Gi diff --git a/packages/ops/ipfs/values.yaml b/packages/ops/ipfs/values.yaml deleted file mode 100644 index 5066928bff..0000000000 --- a/packages/ops/ipfs/values.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# Default values for ipfs. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -ipfsImage: - repo: ipfs/go-ipfs - tag: master-latest - -ipfsClusterImage: - repo: ipfs/ipfs-cluster - tag: latest - -# od -vN 32 -An -tx1 /dev/urandom | tr -d ' \n' -clusterSecret: - -# go get https://github.com/whyrusleeping/ipfs-key OR https://github.com/libp2p/js-peer-id -# ipfs-key --type Ed25519 | base64 -# echo "" | base64 -w 0 - -bootstrapPeerId: -bootstrapPeerPrivateKey: - -nameOverride: "" -fullnameOverride: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: ipfs.etherealengine.com - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/packages/ops/open-match/Chart.yaml b/packages/ops/open-match/Chart.yaml deleted file mode 100755 index 60261473fe..0000000000 --- a/packages/ops/open-match/Chart.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: v2 -name: open-match -description: A Helm chart for Kubernetes -icon: https://avatars3.githubusercontent.com/u/61642798 - -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 1.0.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 0.4.0 - - -#dependencies: - #https://bitnami.com/stack/mariadb/helm -# - name: mariadb -# version: "7.3.16" -# repository: "https://charts.bitnami.com/bitnami" -# # install MariaDB if user does not have external DB -# condition: mariadb.enabled - -# - name: agones -# version: "1.7.0" -# repository: "https://agones.dev/chart/stable" -# condition: agones.enabled - -# - name: redis -# version: "10.7.13" -# repository: "https://charts.bitnami.com/bitnami" -# condition: redis.enabled diff --git a/packages/ops/open-match/templates/01-open-match-core.yaml b/packages/ops/open-match/templates/01-open-match-core.yaml deleted file mode 100644 index 46cdc1b6d3..0000000000 --- a/packages/ops/open-match/templates/01-open-match-core.yaml +++ /dev/null @@ -1,1767 +0,0 @@ ---- -# Source: open-match/templates/service-account.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Include this namespace only when doing `helm template`. -# helm 2 use namespace to manage its release so `helm install` with this namespace will be broken. -apiVersion: v1 -kind: Namespace -metadata: - name: open-match - labels: - app: open-match - release: open-match ---- -# Source: open-match/templates/podsecuritypolicy.yaml -# This does not allow creating privileged pods and restrict binded pods to use the specified port ranges. -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: open-match-core-podsecuritypolicy - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - release: open-match -spec: - allowPrivilegeEscalation: false - defaultAllowPrivilegeEscalation: false - forbiddenSysctls: - - "*" - fsGroup: - rule: "MustRunAs" - ranges: - - min: 1 - max: 65535 - hostIPC: false - hostNetwork: false - hostPID: false - hostPorts: - # Open Match Services - - min: 50500 - max: 50510 - - min: 51500 - max: 51510 - # Cassandra - - min: 7000 - max: 7001 - - min: 7199 - max: 7199 - - min: 9042 - max: 9042 - - min: 9160 - max: 9160 - # Grafana - - min: 3000 - max: 3000 - # Jaeger - - min: 5775 - max: 5778 - - min: 6831 - max: 6832 - - min: 14267 - max: 14268 - - min: 9411 - max: 9411 - - min: 16686 - max: 16686 - # Prometheus - - min: 9090 - max: 9093 - - min: 9100 - max: 9100 - - min: 8080 - max: 8080 - privileged: false # Prevents creation of privileged Pods - readOnlyRootFilesystem: false - # Capabilities Reference: https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities - # TODO: Open Match itself doesn't need any capabilties but its dependencies do. We should split out the service accounts later. - allowedCapabilities: - - CHOWN - #requiredDropCapabilities: - #- ALL - runAsUser: - rule: "RunAsAny" - # Blocked on isolating the open match services from dependencies (Redis, Prometheus, etc.) - # Require the container to run without root privileges. - #rule: 'MustRunAsNonRoot' - seLinux: - # This policy assumes the nodes are using AppArmor rather than SELinux. - rule: 'RunAsAny' - supplementalGroups: - rule: RunAsAny - volumes: - - 'configMap' - - 'emptyDir' - - 'projected' - - 'secret' - - 'downwardAPI' - # Assume that persistentVolumes set up by the cluster admin are safe to use. - - 'persistentVolumeClaim' ---- -# Source: open-match/templates/podsecuritypolicy.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# This is the least restricted PSP used to create privileged pods to disable THP in host kernel. -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: open-match-redis-podsecuritypolicy - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*' - labels: - app: open-match - release: open-match -spec: - privileged: true - allowPrivilegeEscalation: true - allowedCapabilities: - - '*' - volumes: - - '*' - hostNetwork: true - hostPorts: - # Redis - - min: 6379 - max: 6379 - - min: 9121 - max: 9121 - hostIPC: true - hostPID: true - runAsUser: - rule: 'RunAsAny' - seLinux: - rule: 'RunAsAny' - supplementalGroups: - rule: 'RunAsAny' - fsGroup: - rule: 'RunAsAny' ---- -# Source: open-match/charts/redis/templates/configmap-scripts.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: open-match-redis-scripts - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - heritage: Helm - release: open-match -data: - start-node.sh: | - #!/bin/bash - is_boolean_yes() { - local -r bool="${1:-}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then - true - else - false - fi - } - - HEADLESS_SERVICE="open-match-redis-headless.open-match.svc.cluster.local" - REDIS_SERVICE="open-match-redis.open-match.svc.cluster.local" - - export REDIS_REPLICATION_MODE="slave" - if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then - export REDIS_REPLICATION_MODE="master" - fi - - if [[ -n $REDIS_PASSWORD_FILE ]]; then - password_aux=`cat ${REDIS_PASSWORD_FILE}` - export REDIS_PASSWORD=$password_aux - fi - - if [[ -n $REDIS_MASTER_PASSWORD_FILE ]]; then - password_aux=`cat ${REDIS_MASTER_PASSWORD_FILE}` - export REDIS_MASTER_PASSWORD=$password_aux - fi - - if [[ "$REDIS_REPLICATION_MODE" == "master" ]]; then - echo "I am master" - if [[ ! -f /opt/bitnami/redis/etc/master.conf ]];then - cp /opt/bitnami/redis/mounted-etc/master.conf /opt/bitnami/redis/etc/master.conf - fi - else - if [[ ! -f /opt/bitnami/redis/etc/replica.conf ]];then - cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf - fi - - if is_boolean_yes "$REDIS_TLS_ENABLED"; then - sentinel_info_command="redis-cli -h $REDIS_SERVICE -p 26379 --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name om-redis-master" - else - sentinel_info_command="redis-cli -h $REDIS_SERVICE -p 26379 sentinel get-master-addr-by-name om-redis-master" - fi - REDIS_SENTINEL_INFO=($($sentinel_info_command)) - REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} - REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} - - - # Immediately attempt to connect to the reported master. If it doesn't exist the connection attempt will either hang - # or fail with "port unreachable" and give no data. The liveness check will then timeout waiting for the redis - # container to be ready and restart the it. By then the new master will likely have been elected - if is_boolean_yes "$REDIS_TLS_ENABLED"; then - sentinel_info_command="redis-cli -h $REDIS_MASTER_HOST -p 26379 --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name om-redis-master" - else - sentinel_info_command="redis-cli -h $REDIS_MASTER_HOST -p 26379 sentinel get-master-addr-by-name om-redis-master" - fi - - if [[ ! ($($sentinel_info_command)) ]]; then - # master doesn't actually exist, this probably means the remaining pods haven't elected a new one yet - # and are reporting the old one still. Once this happens the container will get stuck and never see the new - # master. We stop here to allow the container to not pass the liveness check and be restarted. - exit 1 - fi - fi - - if [[ ! -f /opt/bitnami/redis/etc/redis.conf ]];then - cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf - fi - ARGS=("--port" "${REDIS_PORT}") - - if [[ "$REDIS_REPLICATION_MODE" == "slave" ]]; then - ARGS+=("--slaveof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") - fi - ARGS+=("--protected-mode" "no") - - if [[ "$REDIS_REPLICATION_MODE" == "master" ]]; then - ARGS+=("--include" "/opt/bitnami/redis/etc/master.conf") - else - ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") - fi - - ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") - exec /run.sh "${ARGS[@]}" - - start-sentinel.sh: | - #!/bin/bash - replace_in_file() { - local filename="${1:?filename is required}" - local match_regex="${2:?match regex is required}" - local substitute_regex="${3:?substitute regex is required}" - local posix_regex=${4:-true} - - local result - - # We should avoid using 'sed in-place' substitutions - # 1) They are not compatible with files mounted from ConfigMap(s) - # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues - if [[ $posix_regex = true ]]; then - result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" - else - result="$(sed "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" - fi - echo "$result" > "$filename" - } - sentinel_conf_set() { - local -r key="${1:?missing key}" - local value="${2:-}" - - # Sanitize inputs - value="${value//\\/\\\\}" - value="${value//&/\\&}" - value="${value//\?/\\?}" - [[ "$value" = "" ]] && value="\"$value\"" - - replace_in_file "/opt/bitnami/redis-sentinel/etc/sentinel.conf" "^#*\s*${key} .*" "${key} ${value}" false - } - sentinel_conf_add() { - echo $'\n'"$@" >> "/opt/bitnami/redis-sentinel/etc/sentinel.conf" - } - is_boolean_yes() { - local -r bool="${1:-}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then - true - else - false - fi - } - host_id() { - echo "$1" | openssl sha1 | awk '{print $2}' - } - - HEADLESS_SERVICE="open-match-redis-headless.open-match.svc.cluster.local" - REDIS_SERVICE="open-match-redis.open-match.svc.cluster.local" - - if [[ -n $REDIS_PASSWORD_FILE ]]; then - password_aux=`cat ${REDIS_PASSWORD_FILE}` - export REDIS_PASSWORD=$password_aux - fi - - if [[ ! -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then - cp /opt/bitnami/redis-sentinel/mounted-etc/sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf - fi - - export REDIS_REPLICATION_MODE="slave" - if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then - export REDIS_REPLICATION_MODE="master" - fi - - if [[ "$REDIS_REPLICATION_MODE" == "master" ]]; then - REDIS_MASTER_HOST="$(hostname -i)" - REDIS_MASTER_PORT_NUMBER="6379" - else - if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then - sentinel_info_command="redis-cli -h $REDIS_SERVICE -p 26379 --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name om-redis-master" - else - sentinel_info_command="redis-cli -h $REDIS_SERVICE -p 26379 sentinel get-master-addr-by-name om-redis-master" - fi - REDIS_SENTINEL_INFO=($($sentinel_info_command)) - REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} - REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} - - # Immediately attempt to connect to the reported master. If it doesn't exist the connection attempt will either hang - # or fail with "port unreachable" and give no data. The liveness check will then timeout waiting for the sentinel - # container to be ready and restart the it. By then the new master will likely have been elected - if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then - sentinel_info_command="redis-cli -h $REDIS_MASTER_HOST -p 26379 --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name om-redis-master" - else - sentinel_info_command="redis-cli -h $REDIS_MASTER_HOST -p 26379 sentinel get-master-addr-by-name om-redis-master" - fi - - if [[ ! ($($sentinel_info_command)) ]]; then - # master doesn't actually exist, this probably means the remaining pods haven't elected a new one yet - # and are reporting the old one still. Once this happens the container will get stuck and never see the new - # master. We stop here to allow the container to not pass the liveness check and be restarted. - exit 1 - fi - fi - sentinel_conf_set "sentinel monitor" "om-redis-master "$REDIS_MASTER_HOST" "$REDIS_MASTER_PORT_NUMBER" 2" - - add_replica() { - if [[ "$1" != "$REDIS_MASTER_HOST" ]]; then - sentinel_conf_add "sentinel known-replica om-redis-master $1 6379" - fi - } - exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel ---- -# Source: open-match/charts/redis/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: open-match-redis - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - heritage: Helm - release: open-match -data: - redis.conf: |- - # User-supplied configuration: - maxclients 100000 - maxmemory 300000000 - - master.conf: |- - dir /data - replica.conf: |- - dir /data - slave-read-only yes - rename-command FLUSHDB "" - rename-command FLUSHALL "" - sentinel.conf: |- - dir "/tmp" - bind 0.0.0.0 - port 26379 - sentinel monitor om-redis-master open-match-redis-node-0.open-match-redis-headless.open-match.svc.cluster.local 6379 2 - sentinel down-after-milliseconds om-redis-master 60000 - sentinel failover-timeout om-redis-master 18000 - sentinel parallel-syncs om-redis-master 1 ---- -# Source: open-match/charts/redis/templates/health-configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: open-match-redis-health - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - heritage: Helm - release: open-match -data: - ping_readiness_local.sh: |- - #!/bin/bash - export REDISCLI_AUTH="$REDIS_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h localhost \ - -p $REDIS_PORT \ - ping - ) - if [ "$response" != "PONG" ]; then - echo "$response" - exit 1 - fi - ping_liveness_local.sh: |- - #!/bin/bash - export REDISCLI_AUTH="$REDIS_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h localhost \ - -p $REDIS_PORT \ - ping - ) - if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then - echo "$response" - exit 1 - fi - ping_sentinel.sh: |- - #!/bin/bash - export REDISCLI_AUTH="$REDIS_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h localhost \ - -p $REDIS_SENTINEL_PORT \ - ping - ) - if [ "$response" != "PONG" ]; then - echo "$response" - exit 1 - fi - parse_sentinels.awk: |- - /ip/ {FOUND_IP=1} - /port/ {FOUND_PORT=1} - /runid/ {FOUND_RUNID=1} - !/ip|port|runid/ { - if (FOUND_IP==1) { - IP=$1; FOUND_IP=0; - } - else if (FOUND_PORT==1) { - PORT=$1; - FOUND_PORT=0; - } else if (FOUND_RUNID==1) { - printf "\nsentinel known-sentinel om-redis-master %s %s %s", IP, PORT, $0; FOUND_RUNID=0; - } - } - ping_readiness_master.sh: |- - #!/bin/bash - export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h $REDIS_MASTER_HOST \ - -p $REDIS_MASTER_PORT_NUMBER \ - ping - ) - if [ "$response" != "PONG" ]; then - echo "$response" - exit 1 - fi - ping_liveness_master.sh: |- - #!/bin/bash - export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h $REDIS_MASTER_HOST \ - -p $REDIS_MASTER_PORT_NUMBER \ - ping - ) - if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then - echo "$response" - exit 1 - fi - ping_readiness_local_and_master.sh: |- - script_dir="$(dirname "$0")" - exit_status=0 - "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? - "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? - exit $exit_status - ping_liveness_local_and_master.sh: |- - script_dir="$(dirname "$0")" - exit_status=0 - "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? - "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? - exit $exit_status ---- -# Source: open-match/templates/om-configmap-default.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -apiVersion: v1 -kind: ConfigMap -metadata: - name: open-match-configmap-default - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: config - release: open-match -data: - matchmaker_config_default.yaml: |- - logging: - level: debug - format: text - rpc: false - # Open Match applies the exponential backoff strategy for its retryable gRPC calls. - # The settings below are the default backoff configuration used in Open Match. - # See https://github.com/cenkalti/backoff/blob/v3/exponential.go for detailed explanations - backoff: - # The initial retry interval (in milliseconds) - initialInterval: 100ms - # maxInterval caps the maximum time elapsed for a retry interval - maxInterval: 500ms - # The next retry interval is multiplied by this multiplier - multiplier: 1.5 - # Randomize the retry interval - randFactor: 0.5 - # maxElapsedTime caps the retry time (in milliseconds) - maxElapsedTime: 3000ms - - api: - backend: - hostname: "open-match-backend" - grpcport: "50505" - httpport: "51505" - frontend: - hostname: "open-match-frontend" - grpcport: "50504" - httpport: "51504" - query: - hostname: "open-match-query" - grpcport: "50503" - httpport: "51503" - synchronizer: - hostname: "open-match-synchronizer" - grpcport: "50506" - httpport: "51506" - swaggerui: - hostname: "open-match-swaggerui" - httpport: "51500" - - # Configurations for api.test and api.scale are used for testing. - test: - hostname: "open-match-test" - grpcport: "50509" - httpport: "51509" - scale: - httpport: "51509" - - redis: - sentinelPort: 26379 - sentinelMaster: om-redis-master - sentinelHostname: open-match-redis - sentinelUsePassword: false - usePassword: false - passwordPath: /opt/bitnami/redis/secrets/redis-password - pool: - maxIdle: 200 - maxActive: 0 - idleTimeout: 0 - healthCheckTimeout: 300ms - - telemetry: - reportingPeriod: "1m" - traceSamplingFraction: "0.01" - zpages: - enable: "true" - jaeger: - enable: "false" - agentEndpoint: "" - collectorEndpoint: "" - prometheus: - enable: "false" - endpoint: "/metrics" - serviceDiscovery: "true" - stackdriverMetrics: - enable: "false" - gcpProjectId: "replace_with_your_project_id" - prefix: "open_match" ---- -# Source: open-match/charts/redis/templates/redis-serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: open-match-redis - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - release: open-match - heritage: Helm ---- -# Source: open-match/templates/service-account.yaml -# Create a universal service account for open-match-core services. -apiVersion: v1 -kind: ServiceAccount -metadata: - name: open-match-unprivileged-service - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - release: open-match -automountServiceAccountToken: true ---- -# Source: open-match/templates/service-account.yaml -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: open-match-service-role - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - release: open-match -rules: -- apiGroups: - - extensions - resources: - - podsecuritypolicies - resourceNames: - - open-match-core-podsecuritypolicy - verbs: - - use ---- -# Source: open-match/templates/service-account.yaml -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: open-match-redis-role - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - release: open-match -rules: -- apiGroups: - - extensions - resources: - - podsecuritypolicies - resourceNames: - - open-match-redis-podsecuritypolicy - verbs: - - use ---- -# Source: open-match/templates/service-account.yaml -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: open-match-service-role-binding - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - release: open-match -subjects: -- kind: Group - name: system:authenticated # All authenticated users - apiGroup: rbac.authorization.k8s.io -roleRef: - kind: Role - name: open-match-service-role - apiGroup: rbac.authorization.k8s.io ---- -# Source: open-match/templates/service-account.yaml -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: open-match-redis-role-binding - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - release: open-match -subjects: -- kind: ServiceAccount - name: open-match-redis - namespace: open-match -roleRef: - kind: Role - name: open-match-redis-role - apiGroup: rbac.authorization.k8s.io ---- -# Source: open-match/charts/redis/templates/headless-svc.yaml -apiVersion: v1 -kind: Service -metadata: - name: open-match-redis-headless - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - release: open-match - heritage: Helm -spec: - type: ClusterIP - clusterIP: None - publishNotReadyAddresses: true - ports: - - name: redis - port: 6379 - targetPort: redis - - name: redis-sentinel - port: 26379 - targetPort: redis-sentinel - selector: - app: redis - release: open-match ---- -# Source: open-match/charts/redis/templates/metrics-svc.yaml -apiVersion: v1 -kind: Service -metadata: - name: open-match-redis-metrics - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - release: open-match - heritage: Helm - app.kubernetes.io/component: "metrics" -spec: - type: ClusterIP - - - ports: - - name: metrics - port: 9121 - targetPort: metrics - selector: - app: redis - release: open-match ---- -# Source: open-match/charts/redis/templates/redis-with-sentinel-svc.yaml -apiVersion: v1 -kind: Service -metadata: - name: open-match-redis - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - release: open-match - heritage: Helm -spec: - type: ClusterIP - - ports: - - name: redis - port: 6379 - targetPort: redis - - name: redis-sentinel - port: 26379 - targetPort: redis-sentinel - selector: - app: redis - release: open-match ---- -# Source: open-match/templates/backend.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -kind: Service -apiVersion: v1 -metadata: - name: open-match-backend - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: backend - release: open-match -spec: - selector: - app: open-match - component: backend - release: open-match - clusterIP: None - type: ClusterIP - ports: - - name: grpc - protocol: TCP - port: 50505 - - name: http - protocol: TCP - port: 51505 ---- -# Source: open-match/templates/frontend.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -kind: Service -apiVersion: v1 -metadata: - name: open-match-frontend - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: frontend - release: open-match -spec: - selector: - app: open-match - component: frontend - release: open-match - type: NodePort - ports: - - name: grpc - protocol: TCP - port: 50504 - - name: http - protocol: TCP - port: 51504 ---- -# Source: open-match/templates/query.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -kind: Service -apiVersion: v1 -metadata: - name: open-match-query - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: query - release: open-match -spec: - selector: - app: open-match - component: query - release: open-match - clusterIP: None - type: ClusterIP - ports: - - name: grpc - protocol: TCP - port: 50503 - - name: http - protocol: TCP - port: 51503 ---- -# Source: open-match/templates/swaggerui.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -kind: Service -apiVersion: v1 -metadata: - name: open-match-swaggerui - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: swaggerui - release: open-match -spec: - selector: - app: open-match - component: swaggerui - type: ClusterIP - ports: - - name: http - protocol: TCP - port: 51500 ---- -# Source: open-match/templates/synchronizer.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -kind: Service -apiVersion: v1 -metadata: - name: open-match-synchronizer - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: synchronizer - release: open-match -spec: - selector: - app: open-match - component: synchronizer - release: open-match - type: ClusterIP - ports: - - name: grpc - protocol: TCP - port: 50506 - - name: http - protocol: TCP - port: 51506 ---- -# Source: open-match/templates/backend.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open-match-backend - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: backend - release: open-match -spec: - replicas: 3 - selector: - matchLabels: - app: open-match - component: backend - template: - metadata: - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - - labels: - app: open-match - component: backend - release: open-match - spec: - - volumes: - - - name: om-config-volume-default - configMap: - name: open-match-configmap-default - - name: om-config-volume-override - configMap: - name: open-match-configmap-override - - - serviceAccountName: open-match-unprivileged-service - containers: - - name: open-match-backend - volumeMounts: - - - name: om-config-volume-default - mountPath: /app/config/default - - name: om-config-volume-override - mountPath: /app/config/override - - - image: "gcr.io/open-match-public-images/openmatch-backend:1.3.0-rc.1" - ports: - - name: grpc - containerPort: 50505 - - name: http - containerPort: 51505 - imagePullPolicy: Always - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 100m - memory: 100Mi - livenessProbe: - httpGet: - scheme: HTTP - path: /healthz - port: 51505 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 3 - readinessProbe: - httpGet: - scheme: HTTP - path: /healthz?readiness=true - port: 51505 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 2 ---- -# Source: open-match/templates/frontend.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open-match-frontend - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: frontend - release: open-match -spec: - replicas: 3 - selector: - matchLabels: - app: open-match - component: frontend - template: - metadata: - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - - labels: - app: open-match - component: frontend - release: open-match - spec: - - volumes: - - - name: om-config-volume-default - configMap: - name: open-match-configmap-default - - name: om-config-volume-override - configMap: - name: open-match-configmap-override - - - serviceAccountName: open-match-unprivileged-service - containers: - - name: open-match-frontend - volumeMounts: - - - name: om-config-volume-default - mountPath: /app/config/default - - name: om-config-volume-override - mountPath: /app/config/override - - - image: "gcr.io/open-match-public-images/openmatch-frontend:1.3.0-rc.1" - ports: - - name: grpc - containerPort: 50504 - - name: http - containerPort: 51504 - imagePullPolicy: Always - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 100m - memory: 100Mi - livenessProbe: - httpGet: - scheme: HTTP - path: /healthz - port: 51504 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 3 - readinessProbe: - httpGet: - scheme: HTTP - path: /healthz?readiness=true - port: 51504 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 2 ---- -# Source: open-match/templates/query.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open-match-query - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: query - release: open-match -spec: - replicas: 3 - selector: - matchLabels: - app: open-match - component: query - template: - metadata: - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - - labels: - app: open-match - component: query - release: open-match - spec: - - volumes: - - - name: om-config-volume-default - configMap: - name: open-match-configmap-default - - name: om-config-volume-override - configMap: - name: open-match-configmap-override - - - serviceAccountName: open-match-unprivileged-service - containers: - - name: open-match-query - volumeMounts: - - - name: om-config-volume-default - mountPath: /app/config/default - - name: om-config-volume-override - mountPath: /app/config/override - - - image: "gcr.io/open-match-public-images/openmatch-query:1.3.0-rc.1" - ports: - - name: grpc - containerPort: 50503 - - name: http - containerPort: 51503 - imagePullPolicy: Always - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 100m - memory: 100Mi - livenessProbe: - httpGet: - scheme: HTTP - path: /healthz - port: 51503 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 3 - readinessProbe: - httpGet: - scheme: HTTP - path: /healthz?readiness=true - port: 51503 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 2 ---- -# Source: open-match/templates/swaggerui.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open-match-swaggerui - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: swaggerui - release: open-match -spec: - replicas: 1 - selector: - matchLabels: - app: open-match - component: swaggerui - template: - metadata: - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: swaggerui - release: open-match - spec: - - volumes: - - - name: om-config-volume-default - configMap: - name: open-match-configmap-default - - name: om-config-volume-override - configMap: - name: open-match-configmap-override - - serviceAccountName: open-match-unprivileged-service - containers: - - name: open-match-swaggerui - volumeMounts: - - - name: om-config-volume-default - mountPath: /app/config/default - - name: om-config-volume-override - mountPath: /app/config/override - - image: "gcr.io/open-match-public-images/openmatch-swaggerui:1.3.0-rc.1" - ports: - - name: http - containerPort: 51500 - imagePullPolicy: Always - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 100m - memory: 100Mi - livenessProbe: - httpGet: - scheme: HTTP - path: /healthz - port: 51500 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 3 - readinessProbe: - httpGet: - scheme: HTTP - path: /healthz?readiness=true - port: 51500 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 2 ---- -# Source: open-match/templates/synchronizer.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open-match-synchronizer - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: synchronizer - release: open-match -spec: - replicas: 1 - selector: - matchLabels: - app: open-match - component: synchronizer - template: - metadata: - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - - labels: - app: open-match - component: synchronizer - release: open-match - spec: - - volumes: - - - name: om-config-volume-default - configMap: - name: open-match-configmap-default - - name: om-config-volume-override - configMap: - name: open-match-configmap-override - - - serviceAccountName: open-match-unprivileged-service - containers: - - name: open-match-synchronizer - volumeMounts: - - - name: om-config-volume-default - mountPath: /app/config/default - - name: om-config-volume-override - mountPath: /app/config/override - - - image: "gcr.io/open-match-public-images/openmatch-synchronizer:1.3.0-rc.1" - ports: - - name: grpc - containerPort: 50506 - - name: http - containerPort: 51506 - imagePullPolicy: Always - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 100m - memory: 100Mi - livenessProbe: - httpGet: - scheme: HTTP - path: /healthz - port: 51506 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 3 - readinessProbe: - httpGet: - scheme: HTTP - path: /healthz?readiness=true - port: 51506 - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 2 ---- -# Source: open-match/templates/backend.yaml -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open-match-backend - namespace: open-match -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open-match-backend - minReplicas: 1 - maxReplicas: 10 - targetCPUUtilizationPercentage: 80 ---- -# Source: open-match/templates/frontend.yaml -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open-match-frontend - namespace: open-match -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open-match-frontend - minReplicas: 1 - maxReplicas: 10 - targetCPUUtilizationPercentage: 80 ---- -# Source: open-match/templates/query.yaml -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open-match-query - namespace: open-match -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open-match-query - minReplicas: 1 - maxReplicas: 10 - targetCPUUtilizationPercentage: 80 ---- -# Source: open-match/charts/redis/templates/redis-node-statefulset.yaml -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: open-match-redis-node - namespace: "open-match" - labels: - app: redis - chart: redis-12.3.3 - release: open-match - heritage: Helm -spec: - replicas: 1 - serviceName: open-match-redis-headless - selector: - matchLabels: - app: redis - release: open-match - role: node - template: - metadata: - labels: - app: redis - release: open-match - chart: redis-12.3.3 - role: node - annotations: - checksum/health: b62aeb1a757af78a16331fcd551c662651447ddc46bd18c4d527133916ab670b - checksum/configmap: 4b70e5f6f3231e5c7c0afb6cded71bb82118e46983d5025537670017240018f4 - checksum/secret: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - prometheus.io/port: "9121" - prometheus.io/scrape: "true" - spec: - - securityContext: - fsGroup: 1001 - serviceAccountName: open-match-redis - containers: - - name: redis - image: docker.io/bitnami/redis:6.0.9-debian-10-r66 - imagePullPolicy: "IfNotPresent" - securityContext: - runAsUser: 1001 - command: - - /bin/bash - - -c - - /opt/bitnami/scripts/start-scripts/start-node.sh - env: - - name: REDIS_MASTER_PORT_NUMBER - value: "6379" - - name: ALLOW_EMPTY_PASSWORD - value: "yes" - - name: REDIS_TLS_ENABLED - value: "no" - - name: REDIS_PORT - value: "6379" - - name: REDIS_DATA_DIR - value: /data - ports: - - name: redis - containerPort: 6379 - livenessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_liveness_local.sh 5 - readinessProbe: - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 10 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_readiness_local.sh 5 - resources: - null - volumeMounts: - - name: start-scripts - mountPath: /opt/bitnami/scripts/start-scripts - - name: health - mountPath: /health - - name: redis-data - mountPath: /data - subPath: - - name: config - mountPath: /opt/bitnami/redis/mounted-etc - - name: redis-tmp-conf - mountPath: /opt/bitnami/redis/etc - - name: sentinel - image: docker.io/bitnami/redis-sentinel:6.0.9-debian-10-r66 - imagePullPolicy: "IfNotPresent" - securityContext: - runAsUser: 1001 - command: - - /bin/bash - - -c - - /opt/bitnami/scripts/start-scripts/start-sentinel.sh - env: - - name: ALLOW_EMPTY_PASSWORD - value: "yes" - - name: REDIS_SENTINEL_TLS_ENABLED - value: "no" - - name: REDIS_SENTINEL_PORT - value: "26379" - ports: - - name: redis-sentinel - containerPort: 26379 - livenessProbe: - initialDelaySeconds: 5 - periodSeconds: 5 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_sentinel.sh 5 - readinessProbe: - initialDelaySeconds: 5 - periodSeconds: 5 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_sentinel.sh 5 - resources: - null - volumeMounts: - - name: start-scripts - mountPath: /opt/bitnami/scripts/start-scripts - - name: health - mountPath: /health - - name: redis-data - mountPath: /data - subPath: - - name: config - mountPath: /opt/bitnami/redis-sentinel/mounted-etc - - name: sentinel-tmp-conf - mountPath: /opt/bitnami/redis-sentinel/etc - - name: metrics - image: docker.io/bitnami/redis-exporter:1.15.0-debian-10-r8 - imagePullPolicy: "IfNotPresent" - securityContext: - runAsUser: 1001 - command: - - /bin/bash - - -c - - | - if [[ -f '/secrets/redis-password' ]]; then - export REDIS_PASSWORD=$(cat /secrets/redis-password) - fi - redis_exporter - env: - - name: REDIS_ALIAS - value: open-match-redis - volumeMounts: - ports: - - name: metrics - containerPort: 9121 - resources: - null - volumes: - - name: start-scripts - configMap: - name: open-match-redis-scripts - defaultMode: 0755 - - name: health - configMap: - name: open-match-redis-health - defaultMode: 0755 - - name: config - configMap: - name: open-match-redis - - name: host-sys - hostPath: - path: /sys - - name: sentinel-tmp-conf - emptyDir: {} - - name: redis-tmp-conf - emptyDir: {} - volumeClaimTemplates: - - metadata: - name: redis-data - labels: - app: redis - release: open-match - heritage: Helm - component: slave - spec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: "8Gi" - - selector: - updateStrategy: - type: RollingUpdate ---- -# Source: open-match/templates/om-configmap-override.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test-role-binding.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test-role.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test-service-account.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tls-secret.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/packages/ops/open-match/templates/06-open-match-override-configmap.yaml b/packages/ops/open-match/templates/06-open-match-override-configmap.yaml deleted file mode 100644 index 1a854d0213..0000000000 --- a/packages/ops/open-match/templates/06-open-match-override-configmap.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -# Source: open-match/templates/om-configmap-override.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -apiVersion: v1 -kind: ConfigMap -metadata: - name: open-match-configmap-override - namespace: open-match - annotations: - chart: open-match-1.3.0-rc.1 - heritage: Helm - labels: - app: open-match - component: config - release: open-match -data: - matchmaker_config_override.yaml: |- - # Length of time between first fetch matches call, and when no further fetch - # matches calls will join the current evaluation/synchronization cycle, - # instead waiting for the next cycle. - registrationInterval: 250ms - # Length of time after match function as started before it will be canceled, - # and evaluator call input is EOF. - proposalCollectionInterval: 20s - # Time after a ticket has been returned from fetch matches (marked as pending) - # before it automatically becomes active again and will be returned by query - # calls. - pendingReleaseTimeout: 1m - # Time after a ticket has been assigned before it is automatically delted. - assignedDeleteTimeout: 10m - # Maximum number of tickets to return on a single QueryTicketsResponse. - queryPageSize: 10000 - backfillLockTimeout: 1m - api: - evaluator: - hostname: "open-match-evaluator" - grpcport: "50508" - httpport: "51508" diff --git a/packages/ops/open-match/templates/07-open-match-default-evaluator.yaml b/packages/ops/open-match/templates/07-open-match-default-evaluator.yaml deleted file mode 100644 index d32c41edd9..0000000000 --- a/packages/ops/open-match/templates/07-open-match-default-evaluator.yaml +++ /dev/null @@ -1,338 +0,0 @@ ---- -# Source: open-match/charts/open-match-customize/templates/evaluator.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Ugly workaround to split out MMF and evaluator -# TODO: Reconsider helm chart structure and move things out after v0.8 release -kind: Service -apiVersion: v1 -metadata: - name: open-match-evaluator - namespace: open-match - annotations: - chart: open-match-customize-0.0.0-dev - heritage: Helm - labels: - app: open-match-customize - component: evaluator - release: open-match -spec: - selector: - app: open-match-customize - component: evaluator - release: open-match - clusterIP: None - type: ClusterIP - ports: - - name: grpc - protocol: TCP - port: 50508 - - name: http - protocol: TCP - port: 51508 ---- -# Source: open-match/charts/open-match-customize/templates/evaluator.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open-match-evaluator - namespace: open-match - labels: - app: open-match-customize - component: evaluator - release: open-match -spec: - replicas: 3 - selector: - matchLabels: - app: open-match-customize - component: evaluator - template: - metadata: - namespace: open-match - annotations: - - chart: open-match-customize-0.0.0-dev - heritage: Helm - labels: - app: open-match-customize - component: evaluator - release: open-match - spec: - - volumes: - - - name: om-config-volume-override - configMap: - name: open-match-configmap-override - - name: om-config-volume-default - configMap: - name: open-match-configmap-default - - serviceAccountName: open-match-unprivileged-service - containers: - - name: open-match-evaluator - volumeMounts: - - - name: om-config-volume-override - mountPath: /app/config/override - - name: om-config-volume-default - mountPath: /app/config/default - - image: "gcr.io/open-match-public-images/openmatch-default-evaluator:1.3.0-rc.1" - ports: - - name: grpc - containerPort: 50508 - - name: http - containerPort: 51508 - imagePullPolicy: Always - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 100m - memory: 100Mi ---- -# Source: open-match/charts/open-match-customize/templates/evaluator.yaml -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open-match-evaluator - namespace: open-match - annotations: - chart: open-match-customize-0.0.0-dev - heritage: Helm -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open-match-evaluator - minReplicas: 1 - maxReplicas: 10 - targetCPUUtilizationPercentage: 80 ---- -# Source: open-match/charts/open-match-customize/templates/matchfunctions.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Ugly workaround to split out MMF and evaluator -# TODO: Reconsider helm chart structure and move things out after v0.8 release ---- -# Source: open-match/templates/backend.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/frontend.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/om-configmap-default.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/om-configmap-override.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/podsecuritypolicy.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/query.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/service-account.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/synchronizer.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test-role-binding.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test-role.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test-service-account.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tests/om-test.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Source: open-match/templates/tls-secret.yaml -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/packages/ops/open-match/templates/frontend-ingress.yaml b/packages/ops/open-match/templates/frontend-ingress.yaml deleted file mode 100644 index 3f08af7938..0000000000 --- a/packages/ops/open-match/templates/frontend-ingress.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - namespace: open-match - name: open-match-frontend - annotations: - kubernetes.io/ingress.class: nginx -spec: - rules: - - host: {{ .Values.frontend.host | quote }} - http: - paths: - - path: /v1/frontendservice - pathType: Prefix - backend: - service: - name: open-match-frontend - port: - number: 51504 diff --git a/packages/ops/package.json b/packages/ops/package.json deleted file mode 100755 index 63d94e41ad..0000000000 --- a/packages/ops/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "@xrengine/ops", - "version": "1.1.3", - "private": true, - "description": "Dev Ops tooling for XREngine", - "repository": "http://github.com/XRFoundation/XREngine", - "author": "XREngine", - "license": "MIT" -} diff --git a/packages/ops/pull-configs.sh b/packages/ops/pull-configs.sh deleted file mode 100755 index 5e9b163b15..0000000000 --- a/packages/ops/pull-configs.sh +++ /dev/null @@ -1,5 +0,0 @@ -set -x - -RELEASE=$1 - -helm get values $RELEASE -o yaml > values/$RELEASE.values.yaml diff --git a/packages/ops/rippled/.helmignore b/packages/ops/rippled/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/packages/ops/rippled/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/packages/ops/rippled/Chart.yaml b/packages/ops/rippled/Chart.yaml deleted file mode 100644 index fba0ecac76..0000000000 --- a/packages/ops/rippled/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: rippled -description: A Helm chart of rippled server by XRFoundation -type: application -appVersion: "1.8.4" - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 diff --git a/packages/ops/rippled/README.md b/packages/ops/rippled/README.md deleted file mode 100755 index 3f44a56455..0000000000 --- a/packages/ops/rippled/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# Rippled - -Rippled charts for [XREngine](https://xrfoundation.io/). - -## Installing the Chart - -Please first create `rippled.cfg` and `validator.txt` files in `./config` folder of charts. For staters create a copy of template files with these names in the same folder. - -To install the chart with the release name `my-release`: - -``` bash -cd RIPPLED_CHARTS_FOLDER -helm install my-release . # Helm 3 -helm install --name my-release . # Helm 2 -``` - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall the `my-release` deployment: - -```console -helm uninstall my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. diff --git a/packages/ops/rippled/config/rippled.template.cfg b/packages/ops/rippled/config/rippled.template.cfg deleted file mode 100644 index e859b7ca09..0000000000 --- a/packages/ops/rippled/config/rippled.template.cfg +++ /dev/null @@ -1,86 +0,0 @@ -[server] -port_rpc_admin_local -port_ws_public - -# port_peer -# port_ws_admin_local -# ssl_key = /etc/ssl/private/server.key -# ssl_cert = /etc/ssl/certs/server.crt - -[port_rpc_admin_local] -port = 5005 -ip = 127.0.0.1 -admin = 127.0.0.1 -protocol = http - -[port_ws_public] -port = 80 -ip = 0.0.0.0 -protocol = ws - -# [port_peer] -# port = 51235 -# ip = 0.0.0.0 -# protocol = peer - -# [port_ws_admin_local] -# port = 6006 -# ip = 127.0.0.1 -# admin = 127.0.0.1 -# protocol = ws - -[node_size] -small - -# tiny -# small -# medium -# large -# huge - -[node_db] -type=NuDB -path=/var/lib/rippled/db/nudb -advisory_delete=0 - -# How many ledgers do we want to keep (history)? -# Integer value that defines the number of ledgers -# between online deletion events -online_delete=256 - -[ledger_history] -# How many ledgers do we want to keep (history)? -# Integer value (ledger count) -# or (if you have lots of TB SSD storage): 'full' -256 - -[database_path] -/var/lib/rippled/db - -[debug_logfile] -/var/log/rippled/debug.log - -[sntp_servers] -time.windows.com -time.apple.com -time.nist.gov -pool.ntp.org - -[ips] -r.ripple.com 51235 - -[validators_file] -validators.txt - -[rpc_startup] -{ "command": "log_level", "severity": "info" } - -# severity (order: lots of information .. only errors) -# debug -# info -# warn -# error -# fatal - -[ssl_verify] -1 \ No newline at end of file diff --git a/packages/ops/rippled/config/validators.template.txt b/packages/ops/rippled/config/validators.template.txt deleted file mode 100644 index 6645118c01..0000000000 --- a/packages/ops/rippled/config/validators.template.txt +++ /dev/null @@ -1,5 +0,0 @@ -[validator_list_sites] - https://vl.ripple.com - -[validator_list_keys] - ED2677ABFFD1B33AC6FBC3062B71F1E8397C1505E1C42C64D11AD1B28FF73F4734 \ No newline at end of file diff --git a/packages/ops/rippled/templates/NOTES.txt b/packages/ops/rippled/templates/NOTES.txt deleted file mode 100644 index 7475781e02..0000000000 --- a/packages/ops/rippled/templates/NOTES.txt +++ /dev/null @@ -1,30 +0,0 @@ -Thank you for installing Rippled by XRFoundation - -1. Rippled is configured based on rippled.cfg and validators.txt files in ./config folder of charts. -2. You can exec into rippled pod to run cli commands. -3. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "rippled.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "rippled.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "rippled.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "rippled.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} - -We would love to hear your feedback: -- contact us on https://xrfoundation.io/ -- join our Discord on https://discord.gg/xrf diff --git a/packages/ops/rippled/templates/_helpers.tpl b/packages/ops/rippled/templates/_helpers.tpl deleted file mode 100644 index 9cc9dba6cc..0000000000 --- a/packages/ops/rippled/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "rippled.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "rippled.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "rippled.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "rippled.labels" -}} -helm.sh/chart: {{ include "rippled.chart" . }} -{{ include "rippled.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "rippled.selectorLabels" -}} -app.kubernetes.io/name: {{ include "rippled.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "rippled.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "rippled.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/packages/ops/rippled/templates/configmap.yaml b/packages/ops/rippled/templates/configmap.yaml deleted file mode 100644 index e7f504c235..0000000000 --- a/packages/ops/rippled/templates/configmap.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "rippled.fullname" . }} - labels: - {{- include "rippled.labels" . | nindent 4 }} -data: - rippled.cfg: |- -{{ .Files.Get "config/rippled.cfg" | indent 4 }} - validators.txt: |- -{{ .Files.Get "config/validators.txt" | indent 4 }} diff --git a/packages/ops/rippled/templates/deployment.yaml b/packages/ops/rippled/templates/deployment.yaml deleted file mode 100644 index ad4e48c03f..0000000000 --- a/packages/ops/rippled/templates/deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "rippled.fullname" . }} - labels: - {{- include "rippled.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "rippled.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "rippled.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "rippled.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - volumeMounts: - - name: rippled-conf - mountPath: /config/rippled.cfg - subPath: rippled.cfg - - name: rippled-conf - mountPath: /config/validators.txt - subPath: validators.txt - ports: - - name: http - containerPort: 80 - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumes: - - name: rippled-conf - configMap: - name: {{ include "rippled.fullname" . }} - items: - - key: rippled.cfg - path: rippled.cfg - - key: validators.txt - path: validators.txt - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/packages/ops/rippled/templates/ingress.yaml b/packages/ops/rippled/templates/ingress.yaml deleted file mode 100644 index f2c9762f8b..0000000000 --- a/packages/ops/rippled/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "rippled.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "rippled.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/packages/ops/rippled/templates/service.yaml b/packages/ops/rippled/templates/service.yaml deleted file mode 100644 index b34ad000f3..0000000000 --- a/packages/ops/rippled/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "rippled.fullname" . }} - labels: - {{- include "rippled.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "rippled.selectorLabels" . | nindent 4 }} diff --git a/packages/ops/rippled/templates/serviceaccount.yaml b/packages/ops/rippled/templates/serviceaccount.yaml deleted file mode 100644 index 0955f2b6c9..0000000000 --- a/packages/ops/rippled/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "rippled.serviceAccountName" . }} - labels: - {{- include "rippled.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/packages/ops/rippled/templates/tests/test-connection.yaml b/packages/ops/rippled/templates/tests/test-connection.yaml deleted file mode 100644 index e63a35541b..0000000000 --- a/packages/ops/rippled/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "rippled.fullname" . }}-test-connection" - labels: - {{- include "rippled.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "rippled.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/packages/ops/rippled/values.yaml b/packages/ops/rippled/values.yaml deleted file mode 100644 index 0fdf887874..0000000000 --- a/packages/ops/rippled/values.yaml +++ /dev/null @@ -1,82 +0,0 @@ -# Default values for rippled. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: xrpllabsofficial/xrpld - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: latest - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: ripple.etherealengine.com - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/packages/ops/scripts/README.md b/packages/ops/scripts/README.md deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/packages/ops/scripts/install-helm.sh b/packages/ops/scripts/install-helm.sh deleted file mode 100755 index f189e78699..0000000000 --- a/packages/ops/scripts/install-helm.sh +++ /dev/null @@ -1,9 +0,0 @@ -set -e -set -x - -curl --output temp-helm.tar.gz https://get.helm.sh/helm-v3.1.2-linux-amd64.tar.gz -tar -zxvf temp-helm.tar.gz -sudo mv linux-amd64/helm /usr/local/bin/helm -rm -rf linux-amd64 -rm temp-helm.tar.gz -echo "source <(helm completion bash)" >> ~/.bashrc diff --git a/packages/ops/scripts/install-kubectl.sh b/packages/ops/scripts/install-kubectl.sh deleted file mode 100755 index acb84a008b..0000000000 --- a/packages/ops/scripts/install-kubectl.sh +++ /dev/null @@ -1,11 +0,0 @@ -set -e -set -x - -curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl -chmod +x ./kubectl -sudo mv ./kubectl /usr/local/bin/kubectl - -# auto complete into kubectl, requires restart of bash -echo "source <(kubectl completion bash)" >> ~/.bashrc -echo "alias k=kubectl" >> ~/.bashrc -echo "complete -F __start_kubectl k" >> ~/.bashrc diff --git a/packages/ops/scripts/install-micro.sh b/packages/ops/scripts/install-micro.sh deleted file mode 100755 index 25768ee3c2..0000000000 --- a/packages/ops/scripts/install-micro.sh +++ /dev/null @@ -1,12 +0,0 @@ -sudo snap install microk8s --classic -# sudo snap alias microk8s.kubectl kubectl -sudo usermod -a -G microk8s $USER -sudo microk8s.status --wait-ready -sudo microk8s.kubectl get nodes -sudo microk8s.kubectl get services -sudo microk8s.kubectl get all --all-namespaces -sudo microk8s.kubectl get no -sudo microk8s.enable dns dashboard registry -sudo microk8s.kubectl config view --raw > $HOME/.kube/config - -echo "logout to be able to access this without sudo" \ No newline at end of file diff --git a/packages/ops/scripts/install-minikube.sh b/packages/ops/scripts/install-minikube.sh deleted file mode 100755 index c73490a7bc..0000000000 --- a/packages/ops/scripts/install-minikube.sh +++ /dev/null @@ -1,8 +0,0 @@ -set -e -set -x - -sudo apt install virtualbox virtualbox-ext-pack - -wget https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 -chmod +x minikube-linux-amd64 -sudo mv minikube-linux-amd64 /usr/local/bin/minikube diff --git a/packages/ops/scripts/publish-docker-hub.sh b/packages/ops/scripts/publish-docker-hub.sh deleted file mode 100755 index 37b9f90ae0..0000000000 --- a/packages/ops/scripts/publish-docker-hub.sh +++ /dev/null @@ -1,22 +0,0 @@ - -set -e -# before you run this you need to run -# $ source .xrengine-secrets to load tokens and passwords - -cd ../client - -git fetch --tags -TAG="$(git describe --abbrev=0 --tags)" - -cd ../ops - -export NEW_TAG=rc0.0.5 -docker-compose -f docker-compose-local.yml build -docker login --username xrengine --password ${DOCKER_HUB_PASSWORD} - -for repo in {client,server,realtime-server}; do - for tag in {$TAG,latest}; do - docker tag xrengine/${repo} xrengine/${repo}:${tag} - docker push xrengine/${repo}:${tag} - done -done \ No newline at end of file diff --git a/packages/ops/upgrade.sh b/packages/ops/upgrade.sh deleted file mode 100755 index 2e458d5da7..0000000000 --- a/packages/ops/upgrade.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -x - -RELEASE=$1 - -helm repo update - -helm upgrade --install $RELEASE xrengine/xrengine --values values/$RELEASE.values.yaml diff --git a/packages/ops/values/.gitkeep b/packages/ops/values/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/packages/ops/xrengine-bot/Chart.yaml b/packages/ops/xrengine-bot/Chart.yaml deleted file mode 100755 index d403b8b1a8..0000000000 --- a/packages/ops/xrengine-bot/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v2 -name: xrengine-bot -description: A Helm chart for Kubernetes -icon: https://avatars3.githubusercontent.com/u/61642798 - -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 1.0.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 0.0.3 \ No newline at end of file diff --git a/packages/ops/xrengine-bot/templates/_helpers.tpl b/packages/ops/xrengine-bot/templates/_helpers.tpl deleted file mode 100755 index 09d32bb87b..0000000000 --- a/packages/ops/xrengine-bot/templates/_helpers.tpl +++ /dev/null @@ -1,68 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "xrengine-bot.bot.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "xrengine-bot.bot.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - - - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "xrengine-bot.bot.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "xrengine-bot.bot.labels" -}} -helm.sh/chart: {{ include "xrengine-bot.bot.chart" . }} -{{ include "xrengine-bot.bot.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine-bot.bot.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine-bot.bot.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: bot -{{- end -}} - - - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine-bot.bot.serviceAccountName" -}} -{{- if .Values.bot.serviceAccount.create -}} - {{ default (include "xrengine-bot.bot.fullname" .) .Values.bot.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.bot.serviceAccount.name }} -{{- end -}} -{{- end -}} \ No newline at end of file diff --git a/packages/ops/xrengine-bot/templates/bot-cluster-role-binding.yaml b/packages/ops/xrengine-bot/templates/bot-cluster-role-binding.yaml deleted file mode 100755 index abc157e92c..0000000000 --- a/packages/ops/xrengine-bot/templates/bot-cluster-role-binding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.bot).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine-bot.bot.fullname" . }} - labels: - {{- include "xrengine-bot.bot.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine-bot.bot.serviceAccountName" . }} - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine-bot.bot.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine-bot/templates/bot-cluster-role.yaml b/packages/ops/xrengine-bot/templates/bot-cluster-role.yaml deleted file mode 100755 index b3fbf19830..0000000000 --- a/packages/ops/xrengine-bot/templates/bot-cluster-role.yaml +++ /dev/null @@ -1,39 +0,0 @@ -{{- if (.Values.bot).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine-bot.bot.fullname" . }} - labels: - {{- include "xrengine-bot.bot.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - events - - services - - configmaps - - endpoints - verbs: - - get - - list - - watch - - create - - update - - delete - - apiGroups: - - "agones.dev" - resources: - - fleets - - fleet - - fleets.agones.dev - - configmap - - gameservers - - gameserver - - gameserversets - verbs: - - get - - update - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine-bot/templates/bot-configmap.yaml b/packages/ops/xrengine-bot/templates/bot-configmap.yaml deleted file mode 100755 index cb5d96e7cf..0000000000 --- a/packages/ops/xrengine-bot/templates/bot-configmap.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if (.Values.bot).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine-bot.bot.fullname" . }} - labels: - {{- include "xrengine-bot.bot.labels" . | nindent 4 }} -data: -{{- if .Values.bot.extraEnv }} -{{ toYaml .Values.bot.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.bot.config }} - NODE_CONFIG: '{{ mustToJson .Values.bot.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-bot/templates/bot-fleet.yaml b/packages/ops/xrengine-bot/templates/bot-fleet.yaml deleted file mode 100755 index 0e06003380..0000000000 --- a/packages/ops/xrengine-bot/templates/bot-fleet.yaml +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 2018 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Full example of a Fleet resource - a set of warm InstanceServers -# that are available to be allocated from. -# To allocate a InstanceServer from a Fleet, use a InstanceServerAllocation -# -{{- if (.Values.bot).enabled }} -apiVersion: "agones.dev/v1" -kind: Fleet -# Fleet Metadata -# https://v1-14.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.14/#objectmeta-v1-meta -metadata: - name: {{ include "xrengine-bot.bot.fullname" . }} -spec: - # the number of InstanceServers to keep Ready or Allocated in this Fleet. Defaults to 0 - replicas: {{ .Values.bot.replicaCount }} - # defines how InstanceServers are organised across the cluster. - # Options include: - # "Packed" (default) is aimed at dynamic Kubernetes clusters, such as cloud providers, wherein we want to bin pack - # resources - # "Distributed" is aimed at static Kubernetes clusters, wherein we want to distribute resources across the entire - # cluster - scheduling: Distributed - # a InstanceServer template - see: - # https://agones.dev/site/docs/reference/gameserver/ for all the options - # strategy: - # The replacement strategy for when the InstanceServer template is changed. Default option is "RollingUpdate", - # "RollingUpdate" will increment by maxSurge value on each iteration, while decrementing by maxUnavailable on each - # iteration, until all InstanceServers have been switched from one version to another. - # "Recreate" terminates all non-allocated InstanceServers, and starts up a new set with the new details to replace them. - # type: RollingUpdate - # Only relevant when `type: RollingUpdate` - # rollingUpdate: - # the amount to increment the new InstanceServers by. Defaults to 25% - # maxSurge: 25% - # the amount to decrements InstanceServers by. Defaults to 25% - # maxUnavailable: 25% - template: - # InstanceServer metadata - metadata: - labels: - {{- include "xrengine-bot.bot.labels" . | nindent 8 }} - # InstanceServer specification - spec: - ports: - - name: default - portPolicy: Dynamic - containerPort: 3030 - protocol: TCP - - health: - initialDelaySeconds: 15 - periodSeconds: 30 - # Parameters for game server sidecar - # sdkServer: - # sdkServer log level parameter has three options: - # - "Info" (default) The SDK server will output all messages except for debug messages - # - "Debug" The SDK server will output all messages including debug messages - # - "Error" The SDK server will only output error messages - # logLevel: Info - # The InstanceServer's Pod template - template: - spec: - serviceAccountName: {{ include "xrengine-bot.bot.serviceAccountName" . }} - containers: - - name: {{ include "xrengine-bot.bot.fullname" . }} - image: "{{ .Values.bot.image.repository }}:{{ .Values.bot.image.tag }}" - imagePullPolicy: {{ .Values.bot.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine-bot.bot.fullname" . }} - optional: true - - env: - - name: KUBERNETES - value: "true" - - name: RELEASE_NAME - value: {{ .Release.Name }} - {{- with .Values.bot.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.bot.affinity }} - affinity: - {{- toYaml . | nindent 12 }} - {{- end }} -{{- end }} - - diff --git a/packages/ops/xrengine-bot/templates/bot-serviceaccount.yaml b/packages/ops/xrengine-bot/templates/bot-serviceaccount.yaml deleted file mode 100755 index 88e9424204..0000000000 --- a/packages/ops/xrengine-bot/templates/bot-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if (.Values.bot).enabled -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine-bot.bot.serviceAccountName" . }} - labels: - {{- include "xrengine-bot.bot.labels" . | nindent 4 }} - {{- with .Values.bot.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-bot/values.yaml b/packages/ops/xrengine-bot/values.yaml deleted file mode 100755 index 819f894a27..0000000000 --- a/packages/ops/xrengine-bot/values.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# Default values for xrengine. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -domain: xrengine.dev - -bot: - enabled: true - name: bot - - replicaCount: 1 - image: - repository: lagunalabs/xrengine-bot - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - service: - type: ClusterIP - port: 3030 - - serviceAccount: - create: true - annotations: {} - name: \ No newline at end of file diff --git a/packages/ops/xrengine-builder/.helmignore b/packages/ops/xrengine-builder/.helmignore deleted file mode 100755 index 0e8a0eb36f..0000000000 --- a/packages/ops/xrengine-builder/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/packages/ops/xrengine-builder/Chart.yaml b/packages/ops/xrengine-builder/Chart.yaml deleted file mode 100755 index a1d4f1872b..0000000000 --- a/packages/ops/xrengine-builder/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v2 -name: xrengine-builder -description: A Helm chart for Kubernetes -icon: https://avatars3.githubusercontent.com/u/61642798 - -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 4.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 0.5.6 diff --git a/packages/ops/xrengine-builder/README.md b/packages/ops/xrengine-builder/README.md deleted file mode 100755 index 7d41384766..0000000000 --- a/packages/ops/xrengine-builder/README.md +++ /dev/null @@ -1,174 +0,0 @@ -# XREngine - -[XREngine](https://xrfoundation.io/) Social Gatherings on the Web. - -## TL;DR - -```console -helm repo add xrengine https://helm.xrengine.io -helm install my-release xrengine/xrengine -``` - -## Introduction - -This chart creates a [XREngine](https://xrfoundation.io/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -[***In Progress***] This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of AWS EKS. - - -## Prerequisites - -- Kubernetes 1.14+ -- Helm v2.11+ or Helm 3.1+ to run "weighted" hooks in right order. -- Persistent Volumes provisioner support in the underlying infrastructure. - -## Installing the Chart - -To install the chart with the release name `my-release`: - -``` bash -helm repo add xrengine https://helm.xrengine.io -helm repo update -helm install my-release xrengine/xrengine # Helm 3 -helm install --name my-release xrengine/xrengine # Helm 2 -``` - -XREngine -The command deploys XREngine on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall/delete the `my-release` deployment: - -```console -helm delete my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the XREngine chart and their default values. - -| Key | Type | Default | Description | -|----------------------------------|------|---------|----------------------------| -| agones.enabled | bool | `false` | Install Agones included with chart, set `false` if you have it installed already on your cluster | -| client.affinity | object | `{}` | Node affinity for the client service | -| client.enabled | bool | `true` | Install xrsocial-client service | -| **client.extraEnv** | object | `{}` | [Additional Configuration](#xrengine-additional-configurations) for the client service | -| client.image.pullPolicy | string | `"Always"` | Image pull policy | -| client.image.repository | string | `"xrsocial/client"` | repo to pull client image from | -| client.image.tag | string | `"latest"` | client version to pull | -| client.imagePullSecrets | list | `[]` | if using a private repo, specify a pull secret | -| client.ingress.annotations | object | `{"kubernetes.io/ingress.class": "nginx"}` | if using a different ingress controller, specify it | -| client.ingress.enabled | bool | `true` | disable ingress definitions | -| **client.ingress.hosts[0].host** | string | `"my.xrengine.com"` | hostname for the client | -| client.ingress.hosts[0].paths[0] | string | `"/"` | default path for client | -| client.name | string | `"xrsocial-client"` | client service name | -| client.nameOverride | string | `""` | changes the client service name | -| client.nodeSelector | object | `{}` | selects a specific node to run on | -| client.securityContext | object | `{}` | overrides client security context | -| client.service.port | int | `3000` | default client port | -| client.service.type | string | `"ClusterIP"` | override client service type | -| client.serviceAccount | object | `{}` | override client service account | -| client.tolerations | list | `[]` | | -| domain | string | `"xrengine.dev"` | domain root for all services, services will be subdomain from it | -| server.affinity | object | `{}` | | -| server.enabled | bool | `true` | Install the xrsocial service | -| **server.extraEnv** | object | `{}` | [Additional Configuration](#xrengine-additional-configurations) for xrsocial service | -| server.fullnameOverride | string | `""` | override server fullname template | -| server.image.pullPolicy | string | `"Always"` | Server pull policy | -| server.image.repository | string | `"xrengine/xrsocial"` | server image repo | -| server.image.tag | string | `"latest"` | server image version | -| server.imagePullSecrets | list | `[]` | server image pull secret | -| server.ingress.annotations | object | `{"kubernetes.io/ingress.class": "nginx"}` | server ingress class | -| server.ingress.enabled | bool | `true` | enable ingress traffic to server | -| **server.ingress.hosts[0].host** | string | `"api.xrsocial.com"` | hastname for server service, used by client for API and backend operations | -| server.ingress.hosts[0].paths[0] | string | `"/"` | default path for server over http | -| server.name | string | `"xrsocial"` | server service name | -| server.nameOverride | string | `""` | overrides name template | -| server.nodeSelector | object | `{}` | specify a node selector | -| server.podSecurityContext | object | `{}` | server pod security | -| server.replicaCount | int | `1` | How many server instances to run | -| server.resources | object | `{}` | CPU/Memory resource requests/limits | -| server.securityContext | object | `{}` | overrides server security context | -| server.service.port | int | `3030` | service http port | -| server.service.type | string | `"ClusterIP"` | Kubernetes service type | -| sql.database | string | `"xrengine"` | Database name within SQL server to connect to | -| sql.password | string | `"password"` | Password for the SQL user. | -| sql.user | string | `"xrengine"` | Username to connect to SQL database | -| sql.host | string | `nil` | hostname of SQL server | -| sql.port | int | `3306` | host port of SQL server | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```console -$ helm install --name my-release \ - --set persistence.enabled=false,email.host=email \ - xrengine/xrengine -``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, - -```console -helm install --name my-release -f values.yaml xrengine/xrengine -``` - -> **Tip**: You can use the default - -## XREngine Additional Configurations - -This section lists configuration specific for server, client components. - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| client.extraEnv.NODE_ENV | string | `"development"` | | -| client.extraEnv.SITE_DESC | string | `"Connected Worlds for Everyone"` | | -| client.extraEnv.SITE_TITLE | string | `"Ethereal Engine"` | | -| rts.extraEnv.NAF_LISTEN_PORT | string | `"8081"` | | -| server.extraEnv.APP_HOST | string | `"http://api.xrengine.local/"` | | -| server.extraEnv.FACEBOOK_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/facebook"` | | -| server.extraEnv.FACEBOOK_CLIENT_ID | string | `nil` | | -| server.extraEnv.FACEBOOK_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.GITHUB_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/github"` | | -| server.extraEnv.GITHUB_CLIENT_ID | string | `nil` | | -| server.extraEnv.GITHUB_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.GOOGLE_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/google"` | | -| server.extraEnv.GOOGLE_CLIENT_ID | string | `nil` | | -| server.extraEnv.GOOGLE_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.MAIL_FROM | string | `"noreply@xrengine.local"` | | -| server.extraEnv.MYSQL_DATABASE | string | `"xrengine"` | | -| server.extraEnv.MYSQL_PASSWORD | string | `"password"` | | -| server.extraEnv.MYSQL_PORT | int | `3306` | | -| server.extraEnv.MYSQL_USER | string | `"server"` | | -| server.extraEnv.PORT | string | `"3030"` | | -| server.extraEnv.SMTP_HOST | string | `nil` | | -| server.extraEnv.SMTP_PASS | string | `nil` | | -| server.extraEnv.SMTP_PORT | string | `nil` | | -| server.extraEnv.SMTP_USER | string | `nil` | | -| server.extraEnv.STORAGE_AWS_ACCESS_KEY_ID | string | `""` | | -| server.extraEnv.STORAGE_AWS_ACCESS_KEY_SECRET | string | `""` | | -| server.extraEnv.STORAGE_PROVIDER | string | `"local"` | | -| server.extraEnv.STORAGE_S3_BUCKET_NAME | string | `"xrengine-storage"` | | -| server.extraEnv.STORAGE_S3_CLOUDFRONT_DOMAIN | string | `"https://.s3.amazonaws.com"` | | -| server.extraEnv.STORAGE_S3_PUBLIC_VIDEO_BUCKET | string | `"xrengine-video"` | | -| server.extraEnv.STORAGE_S3_PUBLIC_VIDEO_PATH | string | `"/"` | | -| server.extraEnv.STORAGE_S3_REGION | string | `""` | | - -## Ingress - -This chart provides support for Ingress resource. If you have an available Ingress Controller such as Nginx or Traefik you maybe want to set `ingress.enabled` to true and choose an `server.ingress.hosts[0].host` and `client.ingress.hosts[0].host` for the URL. Then, you should be able to access the installation using that address. - -## Metrics and Performance monitoring - -[*TBD*] - -## Error reporting and Alerts - -[*TBD*] - -## Upgrading - -[*TBD* - This section will describe any information needed when upgrading the Platform or the chart itself] \ No newline at end of file diff --git a/packages/ops/xrengine-builder/templates/NOTES.txt b/packages/ops/xrengine-builder/templates/NOTES.txt deleted file mode 100755 index 3f235d64b1..0000000000 --- a/packages/ops/xrengine-builder/templates/NOTES.txt +++ /dev/null @@ -1,5 +0,0 @@ -Thank you for installing Ethereal Engine Builder - -This service will now pull in all Projects specified in the connected database, rebuild the monorepo, -upload that to the specified Docker container storage (EKS, Docker Hub, etc.), then deploy that container -to this cluster. diff --git a/packages/ops/xrengine-builder/templates/_helpers.tpl b/packages/ops/xrengine-builder/templates/_helpers.tpl deleted file mode 100755 index 969ee02c31..0000000000 --- a/packages/ops/xrengine-builder/templates/_helpers.tpl +++ /dev/null @@ -1,78 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -# {{- define "xrengine.name" -}} -# {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -# {{- end -}} - -{{- define "xrengine.builder.name" -}} -{{- default .Chart.Name .Values.builder.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "xrengine.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{- define "xrengine.builder.fullname" -}} -{{- if .Values.builder.fullnameOverride -}} -{{- .Values.builder.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.builder.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "xrengine.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "xrengine.builder.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.builder.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.builder.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.builder.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: builder -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.builder.serviceAccountName" -}} -{{- if .Values.builder.serviceAccount.create -}} - {{ default (include "xrengine.builder.fullname" .) .Values.builder.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.builder.serviceAccount.name }} -{{- end -}} -{{- end -}} diff --git a/packages/ops/xrengine-builder/templates/builder-cluster-role-binding.yaml b/packages/ops/xrengine-builder/templates/builder-cluster-role-binding.yaml deleted file mode 100755 index 02f244f190..0000000000 --- a/packages/ops/xrengine-builder/templates/builder-cluster-role-binding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.builder).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine.builder.fullname" . }} - labels: - {{- include "xrengine.builder.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine.builder.serviceAccountName" . }} - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine.builder.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine-builder/templates/builder-cluster-role.yaml b/packages/ops/xrengine-builder/templates/builder-cluster-role.yaml deleted file mode 100755 index 6806e81a70..0000000000 --- a/packages/ops/xrengine-builder/templates/builder-cluster-role.yaml +++ /dev/null @@ -1,49 +0,0 @@ -{{- if (.Values.builder).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine.builder.fullname" . }} - labels: - {{- include "xrengine.builder.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - endpoints - - deployments - verbs: - - get - - list - - watch - - create - - patch - - update - - delete - - apiGroups: - - "apps" - resources: - - deployments - verbs: - - get - - list - - watch - - create - - patch - - update - - delete - - apiGroups: - - "agones.dev" - resources: - - fleets - - fleet - - fleets.agones.dev - - gameservers - - gameserver - - gameservers.agones.dev - - gameserversets - verbs: - - get - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine-builder/templates/builder-configmap.yaml b/packages/ops/xrengine-builder/templates/builder-configmap.yaml deleted file mode 100755 index 3cfa21fd69..0000000000 --- a/packages/ops/xrengine-builder/templates/builder-configmap.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if (.Values.builder).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.builder.fullname" . }} - labels: - {{- include "xrengine.builder.labels" . | nindent 4 }} -data: -{{- if .Values.builder.extraEnv }} -{{ toYaml .Values.builder.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.api.extraEnv }} -{{ toYaml .Values.api.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.instanceserver.extraEnv }} -{{ toYaml .Values.instanceserver.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.client.extraEnv }} -{{ toYaml .Values.client.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.builder.config }} - NODE_CONFIG: '{{ mustToJson .Values.builder.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-builder/templates/builder-deployment.yaml b/packages/ops/xrengine-builder/templates/builder-deployment.yaml deleted file mode 100755 index 4a4f337606..0000000000 --- a/packages/ops/xrengine-builder/templates/builder-deployment.yaml +++ /dev/null @@ -1,156 +0,0 @@ -{{- if (.Values.builder).enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xrengine.builder.fullname" . }} - labels: - {{- include "xrengine.builder.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.builder.replicaCount }} - selector: - matchLabels: - {{- include "xrengine.builder.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "xrengine.builder.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/builder-configmap.yaml") . | sha256sum }} - spec: - {{- with .Values.builder.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.builder.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.builder.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.builder.securityContext | nindent 12 }} - image: "{{ .Values.builder.image.repository }}:{{ .Values.builder.image.tag }}" - imagePullPolicy: {{ .Values.builder.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.builder.fullname" . }} - optional: true - env: - - name: KUBERNETES - value: "true" - {{ if .Values.sql }} - - name: MYSQL_USER - value: {{ .Values.sql.user }} - - name: MYSQL_DATABASE - value: {{ .Values.sql.database }} - - name: MYSQL_PASSWORD - value: {{ .Values.sql.password | quote }} - - name: MYSQL_HOST - value: {{ .Values.sql.host | quote }} - - name: MYSQL_PORT - value: {{ .Values.sql.port | quote }} - {{ else if .Values.mariadb }} - - name: MYSQL_USER - value: {{ .Values.mariadb.db.user }} - - name: MYSQL_DATABASE - value: {{ .Values.mariadb.db.name }} - - name: MYSQL_PASSWORD - {{- if not .Values.mariadb.enabled }} - value: {{ .Values.mariadb.db.password | quote }} - {{- else }} - valueFrom: - secretKeyRef: - {{- if .Values.mariadb.existingSecret }} - name: {{ .Values.mariadb.existingSecret }} - {{- else }} - name: {{ template "xrengine.mariadb.fullname" . }} - {{- end }} - key: mariadb-password - {{- end }} - - name: MYSQL_HOST - value: {{ .Values.mariadb.externalHost }} - - name: MYSQL_PORT - value: {{ .Values.mariadb.externalPort | quote }} - {{ else }} - - name: MYSQL_USER - value: server - - name: MYSQL_DATABASE - value: xrengine - - name: MYSQL_PASSWORD - value: password - - name: MYSQL_HOST - value: host.minikube.internal - - name: MYSQL_PORT - value: 3306 - {{ end }} - - name: REDIS_ENABLED - value: "true" - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - - name: RELEASE_NAME - value: {{ $releaseName }} - - name: DOCKER_HOST - value: tcp://localhost:2376 - - name: DOCKER_TLS_VERIFY - value: "1" - - name: TAG - value: {{ .Values.builder.image.tag }} - ports: - - name: http - containerPort: 3030 - protocol: TCP - livenessProbe: - exec: - command: - - cat - - ./builder-started.txt - initialDelaySeconds: 10 - periodSeconds: 30 - readinessProbe: - exec: - command: - - cat - - ./builder-started.txt - initialDelaySeconds: 10 - periodSeconds: 30 - resources: - {{- toYaml .Values.builder.resources | nindent 12 }} - volumeMounts: - - name: dind-storage - mountPath: /var/lib/docker - - name: dind - image: docker:20.10-dind - securityContext: - privileged: true - env: - - name: DOCKER_TLS_CERTDIR - value: /var/lib/docker/certs - volumeMounts: - - name: dind-storage - mountPath: /var/lib/docker - volumes: - - name: dind-storage - emptyDir: {} - {{- with .Values.builder.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.builder.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.builder.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine-builder/templates/builder-service.yaml b/packages/ops/xrengine-builder/templates/builder-service.yaml deleted file mode 100755 index e10a9fb8f4..0000000000 --- a/packages/ops/xrengine-builder/templates/builder-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if (.Values.builder).enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xrengine.builder.fullname" . }} - labels: - {{- include "xrengine.builder.labels" . | nindent 4 }} -spec: - type: {{ .Values.builder.service.type }} - ports: - - port: {{ .Values.builder.service.port }} - targetPort: {{ .Values.builder.service.port }} - protocol: TCP - name: http - selector: - {{- include "xrengine.builder.selectorLabels" . | nindent 4 }} -{{- end -}} diff --git a/packages/ops/xrengine-builder/templates/builder-serviceaccount.yaml b/packages/ops/xrengine-builder/templates/builder-serviceaccount.yaml deleted file mode 100755 index fe0f570f46..0000000000 --- a/packages/ops/xrengine-builder/templates/builder-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and (.Values.builder).enabled ((.Values.builder).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.builder.serviceAccountName" . }} - labels: - {{- include "xrengine.builder.labels" . | nindent 4 }} - {{- with .Values.builder.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-builder/templates/tests/test-connection.yaml b/packages/ops/xrengine-builder/templates/tests/test-connection.yaml deleted file mode 100755 index 706f0904e3..0000000000 --- a/packages/ops/xrengine-builder/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "xrengine.builder.fullname" . }}-test-connection" - labels: - {{- include "xrengine.builder.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "xrengine.builder.fullname" . }}:{{ .Values.builder.service.port }}'] - restartPolicy: Never diff --git a/packages/ops/xrengine-builder/values.schema.json b/packages/ops/xrengine-builder/values.schema.json deleted file mode 100755 index af5b4eea41..0000000000 --- a/packages/ops/xrengine-builder/values.schema.json +++ /dev/null @@ -1,462 +0,0 @@ -{ - "$schema": "http://json-schema.org/schema#", - "type": "object", - "properties": { - "agones": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - } - }, - "client": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - }, - "domain": { - "type": "string" - }, - "instanceserver": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "tolerations": { - "type": "array" - } - } - }, - "mariadb": { - "type": "object", - "properties": { - "db": { - "type": "object", - "properties": { - "existingSecret": { - "type": "null" - }, - "name": { - "type": "string" - }, - "password": { - "type": "string" - }, - "user": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "externalHost": { - "type": "string" - }, - "externalPort": { - "type": "integer" - }, - "nameOverride": { - "type": "string" - }, - "replication": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - } - } - } - }, - "server": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - }, - "editor": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - } - } -} diff --git a/packages/ops/xrengine-builder/values.yaml b/packages/ops/xrengine-builder/values.yaml deleted file mode 100755 index fad54b92da..0000000000 --- a/packages/ops/xrengine-builder/values.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# Default values for xrengine. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -domain: xrengine.dev - -builder: - enabled: true - name: xrengine-builder - - replicaCount: 1 - image: - repository: lagunalabs/xrengine-builder - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - service: - type: ClusterIP - port: 3030 - - ingress: - enabled: false - annotations: - kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: api.social.local - paths: ["/"] - # tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - - - serviceAccount: - create: true - annotations: {} - name: - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - # Extra Environment variables to configure xrsocial - extraEnv: - -sql: - database: xrengine - user: server - password: password - host: "" - port: 3306 \ No newline at end of file diff --git a/packages/ops/xrengine-matchmaking/.helmignore b/packages/ops/xrengine-matchmaking/.helmignore deleted file mode 100755 index 0e8a0eb36f..0000000000 --- a/packages/ops/xrengine-matchmaking/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/packages/ops/xrengine-matchmaking/Chart.yaml b/packages/ops/xrengine-matchmaking/Chart.yaml deleted file mode 100755 index 0b208be037..0000000000 --- a/packages/ops/xrengine-matchmaking/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v2 -name: xrengine-matchmaking -description: A Helm chart for Kubernetes -icon: https://avatars3.githubusercontent.com/u/61642798 - -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 1.0.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 0.4.13 diff --git a/packages/ops/xrengine-matchmaking/README.md b/packages/ops/xrengine-matchmaking/README.md deleted file mode 100755 index a8de79ae72..0000000000 --- a/packages/ops/xrengine-matchmaking/README.md +++ /dev/null @@ -1,173 +0,0 @@ -# XREngine - -[XREngine](https://xrfoundation.io/) Social Gatherings on the Web. - -## TL;DR - -```console -helm repo add xrengine https://helm.xrengine.io -helm install my-release xrengine/xrengine -``` - -## Introduction - -This chart creates a [XREngine](https://xrfoundation.io/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -[***In Progress***] This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of AWS EKS. - -## Prerequisites - -- Kubernetes 1.14+ -- Helm v2.11+ or Helm 3.1+ to run "weighted" hooks in right order. -- Persistent Volumes provisioner support in the underlying infrastructure. - -## Installing the Chart - -To install the chart with the release name `my-release`: - -``` bash -helm repo add xrengine https://helm.xrengine.io -helm repo update -helm install my-release xrengine/xrengine # Helm 3 -helm install --name my-release xrengine/xrengine # Helm 2 -``` - -XREngine -The command deploys XREngine on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall/delete the `my-release` deployment: - -```console -helm delete my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the XREngine chart and their default values. - -| Key | Type | Default | Description | -|-----|------|---------|----------------------------| -| agones.enabled | bool | `false` | Install Agones included with chart, set `false` if you have it installed already on your cluster | -| client.affinity | object | `{}` | Node affinity for the client service | -| client.enabled | bool | `true` | Install xrsocial-client service | -| **client.extraEnv** | object | `{}` | [Additional Configuration](#xrengine-additional-configurations) for the client service | -| client.image.pullPolicy | string | `"Always"` | Image pull policy | -| client.image.repository | string | `"xrsocial/client"` | repo to pull client image from | -| client.image.tag | string | `"latest"` | client version to pull | -| client.imagePullSecrets | list | `[]` | if using a private repo, specify a pull secret | -| client.ingress.annotations | object | `{"kubernetes.io/ingress.class": "nginx"}` | if using a different ingress controller, specify it | -| client.ingress.enabled | bool | `true` | disable ingress definitions | -| **client.ingress.hosts[0].host** | string | `"my.xrengine.com"` | hostname for the client | -| client.ingress.hosts[0].paths[0] | string | `"/"` | default path for client | -| client.name | string | `"xrsocial-client"` | client service name | -| client.nameOverride | string | `""` | changes the client service name | -| client.nodeSelector | object | `{}` | selects a specific node to run on | -| client.securityContext | object | `{}` | overrides client security context | -| client.service.port | int | `3000` | default client port | -| client.service.type | string | `"ClusterIP"` | override client service type | -| client.serviceAccount | object | `{}` | override client service account | -| client.tolerations | list | `[]` | | -| domain | string | `"xrengine.dev"` | domain root for all services, services will be subdomain from it | -| server.affinity | object | `{}` | | -| server.enabled | bool | `true` | Install the xrsocial service | -| **server.extraEnv** | object | `{}` | [Additional Configuration](#xrengine-additional-configurations) for xrsocial service | -| server.fullnameOverride | string | `""` | override server fullname template | -| server.image.pullPolicy | string | `"Always"` | Server pull policy | -| server.image.repository | string | `"xrengine/xrsocial"` | server image repo | -| server.image.tag | string | `"latest"` | server image version | -| server.imagePullSecrets | list | `[]` | server image pull secret | -| server.ingress.annotations | object | `{"kubernetes.io/ingress.class": "nginx"}` | server ingress class | -| server.ingress.enabled | bool | `true` | enable ingress traffic to server | -| **server.ingress.hosts[0].host** | string | `"api.xrsocial.com"` | hastname for server service, used by client for API and backend operations | -| server.ingress.hosts[0].paths[0] | string | `"/"` | default path for server over http | -| server.name | string | `"xrsocial"` | server service name | -| server.nameOverride | string | `""` | overrides name template | -| server.nodeSelector | object | `{}` | specify a node selector | -| server.podSecurityContext | object | `{}` | server pod security | -| server.replicaCount | int | `1` | How many server instances to run | -| server.resources | object | `{}` | CPU/Memory resource requests/limits | -| server.securityContext | object | `{}` | overrides server security context | -| server.service.port | int | `3030` | service http port | -| server.service.type | string | `"ClusterIP"` | Kubernetes service type | -| sql.database | string | `"xrengine"` | Database name within SQL server to connect to | -| sql.password | string | `"password"` | Password for the SQL user. | -| sql.user | string | `"xrengine"` | Username to connect to SQL database | -| sql.host | string | `nil` | hostname of SQL server | -| sql.port | int | `3306` | host port of SQL server | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```console -$ helm install --name my-release \ - --set persistence.enabled=false,email.host=email \ - xrengine/xrengine -``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, - -```console -helm install --name my-release -f values.yaml xrengine/xrengine -``` - -> **Tip**: You can use the default - -## XREngine Additional Configurations - -This section lists configuration specific for server, client components. - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| client.extraEnv.NODE_ENV | string | `"development"` | | -| client.extraEnv.SITE_DESC | string | `"Connected Worlds for Everyone"` | | -| client.extraEnv.SITE_TITLE | string | `"Ethereal Engine"` | | -| rts.extraEnv.NAF_LISTEN_PORT | string | `"8081"` | | -| server.extraEnv.APP_HOST | string | `"http://api.xrengine.local/"` | | -| server.extraEnv.FACEBOOK_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/facebook"` | | -| server.extraEnv.FACEBOOK_CLIENT_ID | string | `nil` | | -| server.extraEnv.FACEBOOK_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.GITHUB_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/github"` | | -| server.extraEnv.GITHUB_CLIENT_ID | string | `nil` | | -| server.extraEnv.GITHUB_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.GOOGLE_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/google"` | | -| server.extraEnv.GOOGLE_CLIENT_ID | string | `nil` | | -| server.extraEnv.GOOGLE_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.MAIL_FROM | string | `"noreply@xrengine.local"` | | -| server.extraEnv.MYSQL_DATABASE | string | `"xrengine"` | | -| server.extraEnv.MYSQL_PASSWORD | string | `"password"` | | -| server.extraEnv.MYSQL_PORT | int | `3306` | | -| server.extraEnv.MYSQL_USER | string | `"server"` | | -| server.extraEnv.PORT | string | `"3030"` | | -| server.extraEnv.SMTP_HOST | string | `nil` | | -| server.extraEnv.SMTP_PASS | string | `nil` | | -| server.extraEnv.SMTP_PORT | string | `nil` | | -| server.extraEnv.SMTP_USER | string | `nil` | | -| server.extraEnv.STORAGE_AWS_ACCESS_KEY_ID | string | `""` | | -| server.extraEnv.STORAGE_AWS_ACCESS_KEY_SECRET | string | `""` | | -| server.extraEnv.STORAGE_PROVIDER | string | `"local"` | | -| server.extraEnv.STORAGE_S3_BUCKET_NAME | string | `"xrengine-storage"` | | -| server.extraEnv.STORAGE_S3_CLOUDFRONT_DOMAIN | string | `"https://.s3.amazonaws.com"` | | -| server.extraEnv.STORAGE_S3_PUBLIC_VIDEO_BUCKET | string | `"xrengine-video"` | | -| server.extraEnv.STORAGE_S3_PUBLIC_VIDEO_PATH | string | `"/"` | | -| server.extraEnv.STORAGE_S3_REGION | string | `""` | | - -## Ingress - -This chart provides support for Ingress resource. If you have an available Ingress Controller such as Nginx or Traefik you maybe want to set `ingress.enabled` to true and choose an `server.ingress.hosts[0].host` and `client.ingress.hosts[0].host` for the URL. Then, you should be able to access the installation using that address. - -## Metrics and Performance monitoring - -[*TBD*] - -## Error reporting and Alerts - -[*TBD*] - -## Upgrading - -[*TBD* - This section will describe any information needed when upgrading the Platform or the chart itself] \ No newline at end of file diff --git a/packages/ops/xrengine-matchmaking/templates/NOTES.txt b/packages/ops/xrengine-matchmaking/templates/NOTES.txt deleted file mode 100755 index 8a150a0530..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Thank you for installing Ethereal Engine Matchmaking - -This service will set up a director and matchfunction to facilitate matchmaking. \ No newline at end of file diff --git a/packages/ops/xrengine-matchmaking/templates/_helpers.tpl b/packages/ops/xrengine-matchmaking/templates/_helpers.tpl deleted file mode 100755 index 5f519cffcf..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/_helpers.tpl +++ /dev/null @@ -1,119 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -# {{- define "xrengine.name" -}} -# {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -# {{- end -}} - -{{- define "xrengine.director.name" -}} -{{- default .Chart.Name .Values.director.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "xrengine.matchfunction.name" -}} -{{- default .Chart.Name .Values.matchfunction.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "xrengine.matchmaking-namespace" -}} -{{- printf "%s-%s" .Values.release.name .Chart.Name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "xrengine.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{- define "xrengine.director.fullname" -}} -{{- if .Values.director.fullnameOverride -}} -{{- .Values.director.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.director.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - -{{- define "xrengine.matchfunction.fullname" -}} -{{- if .Values.matchfunction.fullnameOverride -}} -{{- .Values.matchfunction.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.matchfunction.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "xrengine.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "xrengine.director.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.director.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{- define "xrengine.matchfunction.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.matchfunction.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.director.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.director.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: director -{{- end -}} - - -{{- define "xrengine.matchfunction.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.matchfunction.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: matchfunction -{{- end -}} - - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.director.serviceAccountName" -}} -{{- if .Values.director.serviceAccount.create -}} - {{ default (include "xrengine.director.fullname" .) .Values.director.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.director.serviceAccount.name }} -{{- end -}} -{{- end -}} - -{{- define "xrengine.matchfunction.serviceAccountName" -}} -{{- if .Values.matchfunction.serviceAccount.create -}} - {{ default (include "xrengine.matchfunction.fullname" .) .Values.matchfunction.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.matchfunction.serviceAccount.name }} -{{- end -}} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/director-cluster-role-binding.yaml b/packages/ops/xrengine-matchmaking/templates/director-cluster-role-binding.yaml deleted file mode 100755 index a4bf4287d0..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/director-cluster-role-binding.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if (.Values.director).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine.director.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.director.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine.director.serviceAccountName" . }} - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine.director.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/director-cluster-role.yaml b/packages/ops/xrengine-matchmaking/templates/director-cluster-role.yaml deleted file mode 100755 index 4ff7e747d7..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/director-cluster-role.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if (.Values.director).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine.director.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.director.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - endpoints - verbs: - - get - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine-matchmaking/templates/director-configmap.yaml b/packages/ops/xrengine-matchmaking/templates/director-configmap.yaml deleted file mode 100755 index 38c0b323d0..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/director-configmap.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.director).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.director.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.director.labels" . | nindent 4 }} -data: -{{- if .Values.director.extraEnv }} -{{ toYaml .Values.director.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.director.config }} - NODE_CONFIG: '{{ mustToJson .Values.director.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/director-deployment.yaml b/packages/ops/xrengine-matchmaking/templates/director-deployment.yaml deleted file mode 100755 index 8043128d59..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/director-deployment.yaml +++ /dev/null @@ -1,86 +0,0 @@ -{{- if (.Values.director).enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xrengine.director.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.director.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.director.replicaCount }} - selector: - matchLabels: - {{- include "xrengine.director.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "xrengine.director.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/director-configmap.yaml") . | sha256sum }} - spec: - {{- with .Values.director.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.director.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.director.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.director.securityContext | nindent 12 }} - image: "{{ .Values.director.image.repository }}:{{ .Values.director.image.tag }}" - imagePullPolicy: {{ .Values.director.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.director.fullname" . }} - optional: true - env: - - name: KUBERNETES - value: "true" - - name: RELEASE_NAME - value: {{ $releaseName }} - - name: TAG - value: {{ .Values.director.image.tag }} - - name: MATCHFUNCTION_PORT - value: {{ quote .Values.matchfunction.service.port }} - - name: RELEASE_FULLNAME - value: {{ include "xrengine.matchfunction.fullname" . }} - - name: NAMESPACE - value : {{ include "xrengine.matchmaking-namespace" . }} - ports: - - name: http - containerPort: 3030 - protocol: TCP - livenessProbe: - httpGet: - path: /live - port: 8086 - initialDelaySeconds: 30 - readinessProbe: - httpGet: - path: /ready - port: 8086 - initialDelaySeconds: 30 - resources: - {{- toYaml .Values.director.resources | nindent 12 }} - volumes: - - name: dind-storage - emptyDir: {} - {{- with .Values.director.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.director.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.director.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine-matchmaking/templates/director-service.yaml b/packages/ops/xrengine-matchmaking/templates/director-service.yaml deleted file mode 100755 index 800a0f394c..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/director-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if (.Values.director).enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xrengine.director.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.director.labels" . | nindent 4 }} -spec: - type: {{ .Values.director.service.type }} - ports: - - port: {{ .Values.director.service.port }} - targetPort: {{ .Values.director.service.port }} - protocol: TCP - name: http - selector: - {{- include "xrengine.director.selectorLabels" . | nindent 4 }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/director-serviceaccount.yaml b/packages/ops/xrengine-matchmaking/templates/director-serviceaccount.yaml deleted file mode 100755 index 727d485ded..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/director-serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if and (.Values.director).enabled ((.Values.director).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.director.serviceAccountName" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.director.labels" . | nindent 4 }} - {{- with .Values.director.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/matchfunction-cluster-role-binding.yaml b/packages/ops/xrengine-matchmaking/templates/matchfunction-cluster-role-binding.yaml deleted file mode 100755 index 77e08898c7..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/matchfunction-cluster-role-binding.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if (.Values.matchfunction).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine.matchfunction.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.matchfunction.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine.matchfunction.serviceAccountName" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine.matchfunction.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/matchfunction-cluster-role.yaml b/packages/ops/xrengine-matchmaking/templates/matchfunction-cluster-role.yaml deleted file mode 100755 index 1af703d1cc..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/matchfunction-cluster-role.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if (.Values.matchfunction).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine.matchfunction.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.matchfunction.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - endpoints - verbs: - - get - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine-matchmaking/templates/matchfunction-configmap.yaml b/packages/ops/xrengine-matchmaking/templates/matchfunction-configmap.yaml deleted file mode 100755 index 575defa04c..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/matchfunction-configmap.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.matchfunction).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.matchfunction.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.matchfunction.labels" . | nindent 4 }} -data: -{{- if .Values.matchfunction.extraEnv }} -{{ toYaml .Values.matchfunction.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.matchfunction.config }} - NODE_CONFIG: '{{ mustToJson .Values.matchfunction.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/matchfunction-deployment.yaml b/packages/ops/xrengine-matchmaking/templates/matchfunction-deployment.yaml deleted file mode 100755 index 05b045d235..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/matchfunction-deployment.yaml +++ /dev/null @@ -1,86 +0,0 @@ -{{- if (.Values.matchfunction).enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xrengine.matchfunction.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.matchfunction.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.matchfunction.replicaCount }} - selector: - matchLabels: - {{- include "xrengine.matchfunction.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "xrengine.matchfunction.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/matchfunction-configmap.yaml") . | sha256sum }} - spec: - {{- with .Values.matchfunction.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.matchfunction.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.matchfunction.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.matchfunction.securityContext | nindent 12 }} - image: "{{ .Values.matchfunction.image.repository }}:{{ .Values.matchfunction.image.tag }}" - imagePullPolicy: {{ .Values.matchfunction.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.matchfunction.fullname" . }} - optional: true - env: - - name: KUBERNETES - value: "true" - - name: RELEASE_NAME - value: {{ $releaseName }} - - name: TAG - value: {{ .Values.matchfunction.image.tag }} - - name: MATCHFUNCTION_PORT - value: {{ quote .Values.matchfunction.service.port }} - - name: RELEASE_FULLNAME - value: {{ include "xrengine.matchfunction.fullname" . }} - - name: NAMESPACE - value : {{ include "xrengine.matchmaking-namespace" . }} - ports: - - name: http - containerPort: {{ .Values.matchfunction.service.port }} - protocol: TCP - livenessProbe: - httpGet: - path: /live - port: 8086 - initialDelaySeconds: 30 - readinessProbe: - httpGet: - path: /ready - port: 8086 - initialDelaySeconds: 30 - resources: - {{- toYaml .Values.matchfunction.resources | nindent 12 }} - volumes: - - name: dind-storage - emptyDir: {} - {{- with .Values.matchfunction.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matchfunction.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matchfunction.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine-matchmaking/templates/matchfunction-service.yaml b/packages/ops/xrengine-matchmaking/templates/matchfunction-service.yaml deleted file mode 100755 index 33fd679195..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/matchfunction-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if (.Values.matchfunction).enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xrengine.matchfunction.fullname" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.matchfunction.labels" . | nindent 4 }} -spec: - type: {{ .Values.matchfunction.service.type }} - ports: - - port: {{ .Values.matchfunction.service.port }} - targetPort: {{ .Values.matchfunction.service.port }} - protocol: TCP - name: grpc - selector: - {{- include "xrengine.matchfunction.selectorLabels" . | nindent 4 }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/matchfunction-serviceaccount.yaml b/packages/ops/xrengine-matchmaking/templates/matchfunction-serviceaccount.yaml deleted file mode 100755 index 39ac684d56..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/matchfunction-serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if and (.Values.matchfunction).enabled ((.Values.matchfunction).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.matchfunction.serviceAccountName" . }} - namespace: {{ include "xrengine.matchmaking-namespace" . }} - labels: - {{- include "xrengine.matchfunction.labels" . | nindent 4 }} - {{- with .Values.matchfunction.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine-matchmaking/templates/xrengine-matchmaking-namespace.yaml b/packages/ops/xrengine-matchmaking/templates/xrengine-matchmaking-namespace.yaml deleted file mode 100644 index 01cca57935..0000000000 --- a/packages/ops/xrengine-matchmaking/templates/xrengine-matchmaking-namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: {{ include "xrengine.matchmaking-namespace" . }} - labels: - app: {{ include "xrengine.matchmaking-namespace" . }} - release: {{ .Release.Name }} \ No newline at end of file diff --git a/packages/ops/xrengine-matchmaking/values.schema.json b/packages/ops/xrengine-matchmaking/values.schema.json deleted file mode 100755 index af5b4eea41..0000000000 --- a/packages/ops/xrengine-matchmaking/values.schema.json +++ /dev/null @@ -1,462 +0,0 @@ -{ - "$schema": "http://json-schema.org/schema#", - "type": "object", - "properties": { - "agones": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - } - }, - "client": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - }, - "domain": { - "type": "string" - }, - "instanceserver": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "tolerations": { - "type": "array" - } - } - }, - "mariadb": { - "type": "object", - "properties": { - "db": { - "type": "object", - "properties": { - "existingSecret": { - "type": "null" - }, - "name": { - "type": "string" - }, - "password": { - "type": "string" - }, - "user": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "externalHost": { - "type": "string" - }, - "externalPort": { - "type": "integer" - }, - "nameOverride": { - "type": "string" - }, - "replication": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - } - } - } - }, - "server": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - }, - "editor": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - } - } -} diff --git a/packages/ops/xrengine-matchmaking/values.yaml b/packages/ops/xrengine-matchmaking/values.yaml deleted file mode 100755 index 3b7b406071..0000000000 --- a/packages/ops/xrengine-matchmaking/values.yaml +++ /dev/null @@ -1,102 +0,0 @@ -# Default values for xrengine. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -domain: xrengine.dev - -release: - name: dev - -director: - enabled: true - name: xrengine-matchmaking-director - - replicaCount: 1 - image: - repository: xrengine-matchmaking-director - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - service: - type: ClusterIP - port: 3030 - - ingress: - enabled: false - annotations: - kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: api.social.local - paths: ["/"] - # tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - - - serviceAccount: - create: true - annotations: {} - name: - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - # Extra Environment variables to configure xrsocial - extraEnv: - -matchfunction: - enabled: true - name: xrengine-matchmaking-matchfunction - - replicaCount: 1 - image: - repository: xrengine-matchmaking-matchfunction - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - service: - type: ClusterIP - port: 50502 - - ingress: - enabled: false - annotations: - kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: api.social.local - paths: ["/"] - # tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - - - serviceAccount: - create: true - annotations: {} - name: - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - # Extra Environment variables to configure xrsocial - extraEnv: diff --git a/packages/ops/xrengine/.helmignore b/packages/ops/xrengine/.helmignore deleted file mode 100755 index 0e8a0eb36f..0000000000 --- a/packages/ops/xrengine/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/packages/ops/xrengine/Chart.yaml b/packages/ops/xrengine/Chart.yaml deleted file mode 100755 index f4ed80e1be..0000000000 --- a/packages/ops/xrengine/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v2 -name: xrengine -description: A Helm chart for Kubernetes -icon: https://avatars3.githubusercontent.com/u/61642798 - -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 4.7.1 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.0.0-rc7 \ No newline at end of file diff --git a/packages/ops/xrengine/README.md b/packages/ops/xrengine/README.md deleted file mode 100755 index 7cbf1e2fec..0000000000 --- a/packages/ops/xrengine/README.md +++ /dev/null @@ -1,173 +0,0 @@ -# XREngine - -[XREngine](https://xrfoundation.io/) Social Gatherings on the Web. - -## TL;DR - -```console -helm repo add xrengine https://helm.xrengine.io -helm install my-release xrengine/xrengine -``` - -## Introduction - -This chart creates a [XREngine](https://xrfoundation.io/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -[***In Progress***] This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of AWS EKS. - -## Prerequisites - -- Kubernetes 1.14+ -- Helm v2.11+ or Helm 3.1+ to run "weighted" hooks in right order. -- Persistent Volumes provisioner support in the underlying infrastructure. - -## Installing the Chart - -To install the chart with the release name `my-release`: - -``` bash -helm repo add xrengine https://helm.xrengine.io -helm repo update -helm install my-release xrengine/xrengine # Helm 3 -helm install --name my-release xrengine/xrengine # Helm 2 -``` - -XREngine -The command deploys XREngine on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall/delete the `my-release` deployment: - -```console -helm delete my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the XREngine chart and their default values. - -| Key | Type | Default | Description | -|----------------------------------|------|--------------------------------------------|--------------------------------------------------------------------------------------------------| -| agones.enabled | bool | `false` | Install Agones included with chart, set `false` if you have it installed already on your cluster | -| client.affinity | object | `{}` | Node affinity for the client service | -| client.enabled | bool | `true` | Install xrsocial-client service | -| **client.extraEnv** | object | `{}` | [Additional Configuration](#xrengine-additional-configurations) for the client service | -| client.image.pullPolicy | string | `"Always"` | Image pull policy | -| client.image.repository | string | `"xrsocial/client"` | repo to pull client image from | -| client.image.tag | string | `"latest"` | client version to pull | -| client.imagePullSecrets | list | `[]` | if using a private repo, specify a pull secret | -| client.ingress.annotations | object | `{"kubernetes.io/ingress.class": "nginx"}` | if using a different ingress controller, specify it | -| client.ingress.enabled | bool | `true` | disable ingress definitions | -| **client.ingress.hosts[0].host** | string | `"my.xrengine.com"` | hostname for the client | -| client.ingress.hosts[0].paths[0] | string | `"/"` | default path for client | -| client.name | string | `"xrsocial-client"` | client service name | -| client.nameOverride | string | `""` | changes the client service name | -| client.nodeSelector | object | `{}` | selects a specific node to run on | -| client.securityContext | object | `{}` | overrides client security context | -| client.service.port | int | `3000` | default client port | -| client.service.type | string | `"ClusterIP"` | override client service type | -| client.serviceAccount | object | `{}` | override client service account | -| client.tolerations | list | `[]` | | -| domain | string | `"xrengine.dev"` | domain root for all services, services will be subdomain from it | -| server.affinity | object | `{}` | | -| server.enabled | bool | `true` | Install the xrsocial service | -| **server.extraEnv** | object | `{}` | [Additional Configuration](#xrengine-additional-configurations) for xrsocial service | -| server.fullnameOverride | string | `""` | override server fullname template | -| server.image.pullPolicy | string | `"Always"` | Server pull policy | -| server.image.repository | string | `"xrengine/xrsocial"` | server image repo | -| server.image.tag | string | `"latest"` | server image version | -| server.imagePullSecrets | list | `[]` | server image pull secret | -| server.ingress.annotations | object | `{"kubernetes.io/ingress.class": "nginx"}` | server ingress class | -| server.ingress.enabled | bool | `true` | enable ingress traffic to server | -| **server.ingress.hosts[0].host** | string | `"api.xrsocial.com"` | hastname for server service, used by client for API and backend operations | -| server.ingress.hosts[0].paths[0] | string | `"/"` | default path for server over http | -| server.name | string | `"xrsocial"` | server service name | -| server.nameOverride | string | `""` | overrides name template | -| server.nodeSelector | object | `{}` | specify a node selector | -| server.podSecurityContext | object | `{}` | server pod security | -| server.replicaCount | int | `1` | How many server instances to run | -| server.resources | object | `{}` | CPU/Memory resource requests/limits | -| server.securityContext | object | `{}` | overrides server security context | -| server.service.port | int | `3030` | service http port | -| server.service.type | string | `"ClusterIP"` | Kubernetes service type | -| sql.database | string | `"xrengine"` | Database name within SQL server to connect to | -| sql.password | string | `"password"` | Password for the SQL user. | -| sql.user | string | `"xrengine"` | Username to connect to SQL database | -| sql.host | string | `nil` | hostname of SQL server | -| sql.port | int | `3306` | host port of SQL server | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```console -$ helm install --name my-release \ - --set persistence.enabled=false,email.host=email \ - xrengine/xrengine -``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, - -```console -helm install --name my-release -f values.yaml xrengine/xrengine -``` - -> **Tip**: You can use the default - -## XREngine Additional Configurations - -This section lists configuration specific for server, client components. - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| client.extraEnv.APP_ENV | string | `"development"` | | -| client.extraEnv.SITE_DESC | string | `"Connected Worlds for Everyone"` | | -| client.extraEnv.SITE_TITLE | string | `"Ethereal Engine"` | | -| rts.extraEnv.NAF_LISTEN_PORT | string | `"8081"` | | -| server.extraEnv.APP_HOST | string | `"http://api.xrengine.local/"` | | -| server.extraEnv.FACEBOOK_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/facebook"` | | -| server.extraEnv.FACEBOOK_CLIENT_ID | string | `nil` | | -| server.extraEnv.FACEBOOK_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.GITHUB_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/github"` | | -| server.extraEnv.GITHUB_CLIENT_ID | string | `nil` | | -| server.extraEnv.GITHUB_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.GOOGLE_CALLBACK_URL | string | `"http://127.0.0.1:3000/oauth/google"` | | -| server.extraEnv.GOOGLE_CLIENT_ID | string | `nil` | | -| server.extraEnv.GOOGLE_CLIENT_SECRET | string | `nil` | | -| server.extraEnv.MAIL_FROM | string | `"noreply@xrengine.local"` | | -| server.extraEnv.MYSQL_DATABASE | string | `"xrengine"` | | -| server.extraEnv.MYSQL_PASSWORD | string | `"password"` | | -| server.extraEnv.MYSQL_PORT | int | `3306` | | -| server.extraEnv.MYSQL_USER | string | `"server"` | | -| server.extraEnv.PORT | string | `"3030"` | | -| server.extraEnv.SMTP_HOST | string | `nil` | | -| server.extraEnv.SMTP_PASS | string | `nil` | | -| server.extraEnv.SMTP_PORT | string | `nil` | | -| server.extraEnv.SMTP_USER | string | `nil` | | -| server.extraEnv.STORAGE_AWS_ACCESS_KEY_ID | string | `""` | | -| server.extraEnv.STORAGE_AWS_ACCESS_KEY_SECRET | string | `""` | | -| server.extraEnv.STORAGE_PROVIDER | string | `"local"` | | -| server.extraEnv.STORAGE_S3_BUCKET_NAME | string | `"xrengine-storage"` | | -| server.extraEnv.STORAGE_S3_CLOUDFRONT_DOMAIN | string | `"https://.s3.amazonaws.com"` | | -| server.extraEnv.STORAGE_S3_PUBLIC_VIDEO_BUCKET | string | `"xrengine-video"` | | -| server.extraEnv.STORAGE_S3_PUBLIC_VIDEO_PATH | string | `"/"` | | -| server.extraEnv.STORAGE_S3_REGION | string | `""` | | - -## Ingress - -This chart provides support for Ingress resource. If you have an available Ingress Controller such as Nginx or Traefik you maybe want to set `ingress.enabled` to true and choose an `server.ingress.hosts[0].host` and `client.ingress.hosts[0].host` for the URL. Then, you should be able to access the installation using that address. - -## Metrics and Performance monitoring - -[*TBD*] - -## Error reporting and Alerts - -[*TBD*] - -## Upgrading - -[*TBD* - This section will describe any information needed when upgrading the Platform or the chart itself] \ No newline at end of file diff --git a/packages/ops/xrengine/instanceserver-rename.values.yaml b/packages/ops/xrengine/instanceserver-rename.values.yaml deleted file mode 100644 index aadc05f99d..0000000000 --- a/packages/ops/xrengine/instanceserver-rename.values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -instanceserver: - enabled: true - name: instanceserver - - replicaCount: 1 - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - service: - type: ClusterIP - port: 3031 - - serviceAccount: - create: true - annotations: {} - name: diff --git a/packages/ops/xrengine/templates/NOTES.txt b/packages/ops/xrengine/templates/NOTES.txt deleted file mode 100755 index b742b566ce..0000000000 --- a/packages/ops/xrengine/templates/NOTES.txt +++ /dev/null @@ -1,67 +0,0 @@ -Thank you for installing Ethereal Engine - -1. Dashboard frontend is running on: -{{- if .Values.client.ingress.enabled }} -{{- range $host := .Values.client.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.client.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.client.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "xrsocial.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.client.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "xrsocial.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "xrsocial.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.client.service.port }} -{{- else if contains "ClusterIP" .Values.client.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "xrsocial.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80 -{{- end }} - -2. API Backend is running on: -{{- if .Values.api.ingress.enabled }} -{{- range $host := .Values.api.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.api.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.api.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "xrsocial.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.api.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "xrsocial.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "xrsocial.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.api.service.port }} -{{- else if contains "ClusterIP" .Values.api.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "xrsocial.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80 -{{- end }} - -3. Studio is running on: -{{- if .Values.client.ingress.enabled }} -{{- range $host := .Values.client.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.client.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}studio - {{- end }} -{{- end }} -{{- end }} - -4. CMS is running on: -{{- if .Values.client.ingress.enabled }} -{{- range $host := .Values.client.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.client.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}admin - {{- end }} -{{- end }} -{{- end }} - -We would love to hear your feedback: -- contact us on https://www.etherealengine.org/ -- join our Discord on https://discord.gg/xrf diff --git a/packages/ops/xrengine/templates/_helpers.tpl b/packages/ops/xrengine/templates/_helpers.tpl deleted file mode 100755 index 7be5131601..0000000000 --- a/packages/ops/xrengine/templates/_helpers.tpl +++ /dev/null @@ -1,346 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -# {{- define "xrengine.name" -}} -# {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -# {{- end -}} - -{{- define "xrengine.taskserver.name" -}} -{{- default .Chart.Name .Values.taskserver.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "xrengine.client.name" -}} -{{- default .Chart.Name .Values.client.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "xrengine.api.name" -}} -{{- default .Chart.Name .Values.api.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "xrengine.media.name" -}} -{{- default .Chart.Name .Values.media.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "xrengine.instanceserver.name" -}} -{{- default .Chart.Name .Values.instanceserver.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "xrengine.testbot.name" -}} -{{- default .Chart.Name (.Values.testbot).nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "xrengine.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - - -{{- define "xrengine.taskserver.fullname" -}} -{{- if .Values.taskserver.fullnameOverride -}} -{{- .Values.taskserver.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.taskserver.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - - -{{- define "xrengine.client.fullname" -}} -{{- if .Values.client.fullnameOverride -}} -{{- .Values.client.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.client.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - - -{{- define "xrengine.api.fullname" -}} -{{- if .Values.api.fullnameOverride -}} -{{- .Values.api.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.api.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - - -{{- define "xrengine.media.fullname" -}} -{{- if .Values.media.fullnameOverride -}} -{{- .Values.media.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.media.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - -{{- define "xrengine.instanceserver.fullname" -}} -{{- if .Values.instanceserver.fullnameOverride -}} -{{- .Values.instanceserver.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name .Values.instanceserver.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - - -{{- define "xrengine.testbot.fullname" -}} -{{- if (.Values.testbot).fullnameOverride -}} -{{- .Values.testbot.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name (.Values.testbot).name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - -{{- define "xrengine.client.host" -}} -{{- printf "%s.%s.%s" "dashboard" .Release.Name .Values.domain -}} -{{- end -}} - - -{{- define "xrengine.media.host" -}} -{{- printf "%s.%s.%s" "media" .Release.Name .Values.domain -}} -{{- end -}} - - - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "xrengine.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "xrengine.taskserver.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.taskserver.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.taskserver.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.taskserver.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: taskserver -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "xrengine.client.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.client.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.client.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.client.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: client -{{- end -}} - - -{{/* -Common labels -*/}} -{{- define "xrengine.api.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.api.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.api.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.api.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: api -{{- end -}} - - -{{/* -Common labels -*/}} -{{- define "xrengine.media.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.media.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.media.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.media.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: media -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "xrengine.instanceserver.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.instanceserver.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.instanceserver.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.instanceserver.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: instanceserver -{{- end -}} - - -{{/* -Common labels -*/}} -{{- define "xrengine.testbot.labels" -}} -helm.sh/chart: {{ include "xrengine.chart" . }} -{{ include "xrengine.testbot.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "xrengine.testbot.selectorLabels" -}} -app.kubernetes.io/name: {{ include "xrengine.testbot.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/component: testbot -{{- end -}} - - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.taskserver.serviceAccountName" -}} -{{- if .Values.taskserver.serviceAccount.create -}} - {{ default (include "xrengine.taskserver.fullname" .) .Values.taskserver.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.taskserver.serviceAccount.name }} -{{- end -}} -{{- end -}} - - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.client.serviceAccountName" -}} -{{- if .Values.client.serviceAccount.create -}} - {{ default (include "xrengine.client.fullname" .) .Values.client.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.client.serviceAccount.name }} -{{- end -}} -{{- end -}} - - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.api.serviceAccountName" -}} -{{- if .Values.api.serviceAccount.create -}} - {{ default (include "xrengine.api.fullname" .) .Values.api.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.api.serviceAccount.name }} -{{- end -}} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.media.serviceAccountName" -}} -{{- if .Values.media.serviceAccount.create -}} - {{ default (include "xrengine.media.fullname" .) .Values.media.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.media.serviceAccount.name }} -{{- end -}} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.instanceserver.serviceAccountName" -}} -{{- if .Values.instanceserver.serviceAccount.create -}} - {{ default (include "xrengine.instanceserver.fullname" .) .Values.instanceserver.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.instanceserver.serviceAccount.name }} -{{- end -}} -{{- end -}} - - -{{/* -Create the name of the service account to use -*/}} -{{- define "xrengine.testbot.serviceAccountName" -}} -{{- if ((.Values.testbot).serviceAccount).create -}} - {{ default (include "xrengine.testbot.fullname" .) .Values.testbot.serviceAccount.name }} -{{- else -}} - {{ default "default" ((.Values.testbot).serviceAccount).name }} -{{- end -}} -{{- end -}} - - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "xrengine.mariadb.fullname" -}} -{{- if ((.Values.mariadb).fullnameOverride) -}} -{{- .Values.mariadb.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.mariadb.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - - -{{/* -Set maria host -*/}} -{{- define "xrengine.mariadb.host" -}} -{{- if ((.Values.mariadb).enabled) -}} -{{- template "xrengine.mariadb.fullname" . -}} -{{- else if ((.Values.mariadb).externalHost) -}} -{{- .Values.mariadb.externalHost | quote -}} -{{- end -}} -{{- end -}} diff --git a/packages/ops/xrengine/templates/api-server-cluster-role-binding.yaml b/packages/ops/xrengine/templates/api-server-cluster-role-binding.yaml deleted file mode 100755 index ba08ae3a67..0000000000 --- a/packages/ops/xrengine/templates/api-server-cluster-role-binding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.api).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine.api.fullname" . }} - labels: - {{- include "xrengine.api.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine.api.serviceAccountName" . }} - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine.api.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/api-server-cluster-role.yaml b/packages/ops/xrengine/templates/api-server-cluster-role.yaml deleted file mode 100755 index 18257f3bd4..0000000000 --- a/packages/ops/xrengine/templates/api-server-cluster-role.yaml +++ /dev/null @@ -1,64 +0,0 @@ -{{- if (.Values.api).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine.api.fullname" . }} - labels: - {{- include "xrengine.api.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - pods/log - - endpoints - - deployments - - jobs - verbs: - - get - - list - - watch - - create - - update - - delete - - patch - - apiGroups: - - "apps" - resources: - - deployments - verbs: - - get - - list - - watch - - create - - patch - - update - - delete - - apiGroups: - - "batch" - resources: - - jobs - - cronjobs - verbs: - - get - - list - - watch - - create - - patch - - update - - delete - - apiGroups: - - "agones.dev" - resources: - - fleets - - fleet - - fleets.agones.dev - - gameservers - - gameserver - - gameservers.agones.dev - - gameserversets - verbs: - - get - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine/templates/api-server-configmap.yaml b/packages/ops/xrengine/templates/api-server-configmap.yaml deleted file mode 100755 index 64949b6f3e..0000000000 --- a/packages/ops/xrengine/templates/api-server-configmap.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if (.Values.api).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.api.fullname" . }} - labels: - {{- include "xrengine.api.labels" . | nindent 4 }} -data: -{{- if .Values.api.extraEnv }} -{{ toYaml .Values.api.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.instanceserver.extraEnv }} -{{ toYaml .Values.instanceserver.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.client.extraEnv }} -{{ toYaml .Values.client.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.api.config }} - NODE_CONFIG: '{{ mustToJson .Values.api.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/api-server-deployment.yaml b/packages/ops/xrengine/templates/api-server-deployment.yaml deleted file mode 100755 index 6e06013ce8..0000000000 --- a/packages/ops/xrengine/templates/api-server-deployment.yaml +++ /dev/null @@ -1,166 +0,0 @@ -{{- if (.Values.api).enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xrengine.api.fullname" . }} - labels: - {{- include "xrengine.api.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.api.replicaCount }} - selector: - matchLabels: - {{- include "xrengine.api.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "xrengine.api.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/api-server-configmap.yaml") . | sha256sum }} - spec: - {{- with .Values.api.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.api.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.api.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.api.securityContext | nindent 12 }} - image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag }}" - imagePullPolicy: {{ .Values.api.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.api.fullname" . }} - optional: true - env: - - name: SERVER_MODE - value: "api" - - name: KUBERNETES - value: "true" - {{ if .Values.sql }} - - name: MYSQL_USER - value: {{ .Values.sql.user }} - - name: MYSQL_DATABASE - value: {{ .Values.sql.database }} - - name: MYSQL_PASSWORD - value: {{ .Values.sql.password | quote }} - - name: MYSQL_HOST - value: {{ .Values.sql.host | quote }} - - name: MYSQL_PORT - value: {{ .Values.sql.port | quote }} - {{ else if .Values.mariadb }} - - name: MYSQL_USER - value: {{ .Values.mariadb.db.user }} - - name: MYSQL_DATABASE - value: {{ .Values.mariadb.db.name }} - - name: MYSQL_PASSWORD - {{- if not .Values.mariadb.enabled }} - value: {{ .Values.mariadb.db.password | quote }} - {{- else }} - valueFrom: - secretKeyRef: - {{- if .Values.mariadb.existingSecret }} - name: {{ .Values.mariadb.existingSecret }} - {{- else }} - name: {{ template "xrengine.mariadb.fullname" . }} - {{- end }} - key: mariadb-password - {{- end }} - - name: MYSQL_HOST - value: {{ .Values.mariadb.externalHost }} - - name: MYSQL_PORT - value: {{ .Values.mariadb.externalPort | quote }} - {{ else }} - - name: MYSQL_USER - value: server - - name: MYSQL_DATABASE - value: xrengine - - name: MYSQL_PASSWORD - value: password - - name: MYSQL_HOST - value: host.minikube.internal - - name: MYSQL_PORT - value: 3306 - {{ end }} - - name: REDIS_ENABLED - value: "true" - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - - name: RELEASE_NAME - value: {{ $releaseName }} - - name: BUILDER_REPOSITORY - value: {{ .Values.builder.image.repository }} - ports: - - name: http - containerPort: 3030 - protocol: TCP - livenessProbe: - httpGet: - path: /healthcheck - port: http - initialDelaySeconds: 10 - readinessProbe: - httpGet: - path: /healthcheck - port: http - initialDelaySeconds: 10 - resources: - {{- toYaml .Values.api.resources | nindent 12 }} - {{ if eq .Values.api.extraEnv.STORAGE_PROVIDER "local" }} - volumeMounts: - - mountPath: /app/packages/server/upload - name: file-server - {{- end }} - {{ if eq .Values.api.extraEnv.STORAGE_PROVIDER "local" }} - volumes: - - name: file-server - {{ if eq .Values.clusterType "microk8s" }} - persistentVolumeClaim: - claimName: file-server-pvc - {{- end }} - {{ if eq .Values.clusterType "minikube" }} - hostPath: - path: {{ .Values.api.fileServer.hostUploadFolder }} - type: DirectoryOrCreate - {{- end }} - {{- end }} - initContainers: - - name: init-redis - image: busybox:1.28 - command: [ 'sh', '-c', 'until (printf "AUTH $REDIS_PASSWORD\r\nPING\r\n";) | nc $REDIS_ADDRESS $REDIS_PORT ; do echo waiting for redis-master; sleep 2; done' ] - env: - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - {{- with .Values.api.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/api-server-ingress.yaml b/packages/ops/xrengine/templates/api-server-ingress.yaml deleted file mode 100755 index f29d0de9c0..0000000000 --- a/packages/ops/xrengine/templates/api-server-ingress.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{{- if and (.Values.api).enabled (ne (((.Values.api).ingress).disabled | default "") "true") -}} -{{- $fullName := include "xrengine.api.fullname" . -}} -{{- $svcPort := .Values.api.service.port -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "xrengine.api.labels" . | nindent 4 }} - {{- with .Values.api.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: -{{- if .Values.api.ingress.tls }} - tls: - {{- range .Values.api.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.api.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ . }} - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- end }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/api-server-persistent-volume-claim.yaml b/packages/ops/xrengine/templates/api-server-persistent-volume-claim.yaml deleted file mode 100644 index a9043ee02c..0000000000 --- a/packages/ops/xrengine/templates/api-server-persistent-volume-claim.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{ if eq .Values.clusterType "microk8s" }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: file-server-pvc -spec: - storageClassName: file-server-sc - accessModes: [ReadWriteOnce] - resources: { requests: { storage: 1Gi } } -{{- end }} \ No newline at end of file diff --git a/packages/ops/xrengine/templates/api-server-persistent-volume.yaml b/packages/ops/xrengine/templates/api-server-persistent-volume.yaml deleted file mode 100644 index 4f1dc51108..0000000000 --- a/packages/ops/xrengine/templates/api-server-persistent-volume.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{ if eq .Values.clusterType "microk8s" }} -apiVersion: v1 -kind: PersistentVolume -metadata: - name: file-server-pv -spec: - storageClassName: file-server-sc - accessModes: [ReadWriteOnce] - capacity: - storage: 1Gi - hostPath: - path: {{ .Values.api.fileServer.hostUploadFolder }} -{{- end }} \ No newline at end of file diff --git a/packages/ops/xrengine/templates/api-server-service.yaml b/packages/ops/xrengine/templates/api-server-service.yaml deleted file mode 100755 index bb0fa8732e..0000000000 --- a/packages/ops/xrengine/templates/api-server-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if (.Values.api).enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xrengine.api.fullname" . }} - labels: - {{- include "xrengine.api.labels" . | nindent 4 }} -spec: - type: {{ .Values.api.service.type }} - ports: - - port: {{ .Values.api.service.port }} - targetPort: {{ .Values.api.service.port }} - protocol: TCP - name: http - selector: - {{- include "xrengine.api.selectorLabels" . | nindent 4 }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/api-server-serviceaccount.yaml b/packages/ops/xrengine/templates/api-server-serviceaccount.yaml deleted file mode 100755 index 149d0340e8..0000000000 --- a/packages/ops/xrengine/templates/api-server-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and (.Values.api).enabled ((.Values.api).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.api.serviceAccountName" . }} - labels: - {{- include "xrengine.api.labels" . | nindent 4 }} - {{- with .Values.api.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/api-server-storage-class.yaml b/packages/ops/xrengine/templates/api-server-storage-class.yaml deleted file mode 100644 index 4fe19a4dda..0000000000 --- a/packages/ops/xrengine/templates/api-server-storage-class.yaml +++ /dev/null @@ -1,8 +0,0 @@ -{{ if eq .Values.clusterType "microk8s" }} -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: file-server-sc -provisioner: kubernetes.io/no-provisioner -volumeBindingMode: Immediate -{{- end }} \ No newline at end of file diff --git a/packages/ops/xrengine/templates/client-configmap.yaml b/packages/ops/xrengine/templates/client-configmap.yaml deleted file mode 100755 index 2b3728a1c6..0000000000 --- a/packages/ops/xrengine/templates/client-configmap.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if (.Values.client).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.client.fullname" . }} - labels: - {{- include "xrengine.client.labels" . | nindent 4 }} -data: -{{- if .Values.client.extraEnv }} -{{ toYaml .Values.client.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.client.config }} - NODE_CONFIG: '{{ mustToJson .Values.client.config }}' -{{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/client-deployment.yaml b/packages/ops/xrengine/templates/client-deployment.yaml deleted file mode 100755 index c3dae03a35..0000000000 --- a/packages/ops/xrengine/templates/client-deployment.yaml +++ /dev/null @@ -1,121 +0,0 @@ -{{- if (.Values.client).enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xrengine.client.fullname" . }} - labels: - {{- include "xrengine.client.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.client.replicaCount }} - selector: - matchLabels: - {{- include "xrengine.client.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "xrengine.client.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/client-configmap.yaml") . | sha256sum }} - spec: - {{- with .Values.client.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.client.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.client.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.client.securityContext | nindent 12 }} - image: "{{ .Values.client.image.repository }}:{{ .Values.client.image.tag }}" - imagePullPolicy: {{ .Values.client.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.client.fullname" . }} - optional: true - env: - - name: SERVER_MODE - value: "client" - - name: KUBERNETES - value: "true" - {{ if .Values.sql }} - - name: MYSQL_USER - value: {{ .Values.sql.user }} - - name: MYSQL_DATABASE - value: {{ .Values.sql.database }} - - name: MYSQL_PASSWORD - value: {{ .Values.sql.password | quote }} - - name: MYSQL_HOST - value: {{ .Values.sql.host | quote }} - - name: MYSQL_PORT - value: {{ .Values.sql.port | quote }} - {{ else if .Values.mariadb }} - - name: MYSQL_USER - value: {{ .Values.mariadb.db.user }} - - name: MYSQL_DATABASE - value: {{ .Values.mariadb.db.name }} - - name: MYSQL_PASSWORD - {{- if not .Values.mariadb.enabled }} - value: {{ .Values.mariadb.db.password | quote }} - {{- else }} - valueFrom: - secretKeyRef: - {{- if .Values.mariadb.existingSecret }} - name: {{ .Values.mariadb.existingSecret }} - {{- else }} - name: {{ template "xrengine.mariadb.fullname" . }} - {{- end }} - key: mariadb-password - {{- end }} - - name: MYSQL_HOST - value: {{ .Values.mariadb.externalHost }} - - name: MYSQL_PORT - value: {{ .Values.mariadb.externalPort | quote }} - {{ else }} - - name: MYSQL_USER - value: server - - name: MYSQL_DATABASE - value: xrengine - - name: MYSQL_PASSWORD - value: password - - name: MYSQL_HOST - value: host.minikube.internal - - name: MYSQL_PORT - value: 3306 - {{ end }} - - name: RELEASE_NAME - value: {{ $releaseName }} - ports: - - name: http - containerPort: 3000 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 10 - readinessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 10 - resources: - {{- toYaml .Values.client.resources | nindent 12 }} - {{- with .Values.client.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.client.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.client.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/client-ingress.yaml b/packages/ops/xrengine/templates/client-ingress.yaml deleted file mode 100755 index a4bc76d261..0000000000 --- a/packages/ops/xrengine/templates/client-ingress.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if and (.Values.client).enabled (ne (((.Values.client).ingress).disabled | default "") "true") -}} -{{- $fullName := include "xrengine.client.fullname" . -}} -{{- $svcPort := .Values.client.service.port -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "xrengine.client.labels" . | nindent 4 }} - {{- with .Values.client.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: -{{- if .Values.client.ingress.tls }} - tls: - {{- range .Values.client.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.client.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ . }} - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- end }} - {{- end }} -{{- end }} - diff --git a/packages/ops/xrengine/templates/client-service.yaml b/packages/ops/xrengine/templates/client-service.yaml deleted file mode 100755 index be8eda4d3c..0000000000 --- a/packages/ops/xrengine/templates/client-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if (.Values.client).enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xrengine.client.fullname" . }} - labels: - {{- include "xrengine.client.labels" . | nindent 4 }} -spec: - type: {{ .Values.client.service.type }} - ports: - - port: {{ .Values.client.service.port }} - targetPort: {{ .Values.client.service.port }} - protocol: TCP - name: http - selector: - {{- include "xrengine.client.selectorLabels" . | nindent 4 }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/client-serviceaccount.yaml b/packages/ops/xrengine/templates/client-serviceaccount.yaml deleted file mode 100755 index 111b307e71..0000000000 --- a/packages/ops/xrengine/templates/client-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and (.Values.client).enabled ((.Values.client).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.client.serviceAccountName" . }} - labels: - {{- include "xrengine.client.labels" . | nindent 4 }} - {{- with .Values.client.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/instance-server-cluster-role-binding.yaml b/packages/ops/xrengine/templates/instance-server-cluster-role-binding.yaml deleted file mode 100755 index b8d721ce99..0000000000 --- a/packages/ops/xrengine/templates/instance-server-cluster-role-binding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.instanceserver).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine.instanceserver.fullname" . }} - labels: - {{- include "xrengine.instanceserver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine.instanceserver.serviceAccountName" . }} - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine.instanceserver.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/instance-server-cluster-role.yaml b/packages/ops/xrengine/templates/instance-server-cluster-role.yaml deleted file mode 100755 index d54f349b75..0000000000 --- a/packages/ops/xrengine/templates/instance-server-cluster-role.yaml +++ /dev/null @@ -1,64 +0,0 @@ -{{- if (.Values.instanceserver).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine.instanceserver.fullname" . }} - labels: - {{- include "xrengine.instanceserver.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - events - - services - - configmaps - - endpoints - - deployments - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - "apps" - resources: - - deployments - verbs: - - get - - list - - watch - - create - - patch - - update - - delete - - apiGroups: - - "networking.k8s.io" - resources: - - ingresses - verbs: - - get - - list - - watch - - create - - patch - - delete - - apiGroups: - - "agones.dev" - resources: - - fleets - - fleet - - fleets.agones.dev - - configmap - - gameservers - - gameserver - - gameserversets - verbs: - - get - - update - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine/templates/instance-server-configmap.yaml b/packages/ops/xrengine/templates/instance-server-configmap.yaml deleted file mode 100755 index 43c4f96799..0000000000 --- a/packages/ops/xrengine/templates/instance-server-configmap.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if (.Values.instanceserver).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.instanceserver.fullname" . }} - labels: - {{- include "xrengine.instanceserver.labels" . | nindent 4 }} -data: -{{- if .Values.instanceserver.extraEnv }} -{{ toYaml .Values.instanceserver.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.instanceserver.config }} - NODE_CONFIG: '{{ mustToJson .Values.instanceserver.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/instance-server-fleet-autoscaler.yaml b/packages/ops/xrengine/templates/instance-server-fleet-autoscaler.yaml deleted file mode 100755 index 52970c0513..0000000000 --- a/packages/ops/xrengine/templates/instance-server-fleet-autoscaler.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2018 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# A FleetAutoscaler is used to scale the fleet automatically -# up and down depending on usage -# -{{- if (.Values.instanceserver).enabled }} -apiVersion: "autoscaling.agones.dev/v1" -kind: FleetAutoscaler -metadata: - name: {{ include "xrengine.instanceserver.fullname" . }} -spec: - fleetName: {{ include "xrengine.instanceserver.fullname" . }} - policy: - type: Buffer - buffer: - {{- if not (empty .Values.instanceserver.buffer) }} - bufferSize: {{ .Values.instanceserver.buffer.bufferSize | default 2 }} - minReplicas: {{ .Values.instanceserver.buffer.minReplicas | default 2 }} - maxReplicas: {{ .Values.instanceserver.buffer.maxReplicas | default 10 }} - {{- else }} - bufferSize: 2 - minReplicas: 2 - maxReplicas: 10 - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/instance-server-fleet.yaml b/packages/ops/xrengine/templates/instance-server-fleet.yaml deleted file mode 100755 index 605f748c22..0000000000 --- a/packages/ops/xrengine/templates/instance-server-fleet.yaml +++ /dev/null @@ -1,982 +0,0 @@ -# Copyright 2018 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Full example of a Fleet resource - a set of warm InstanceServers -# that are available to be allocated from. -# To allocate a InstanceServer from a Fleet, use a InstanceServerAllocation -# -{{- if (.Values.instanceserver).enabled }} -apiVersion: "agones.dev/v1" -kind: Fleet -# Fleet Metadata -# https://v1-14.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.14/#objectmeta-v1-meta -metadata: - name: {{ include "xrengine.instanceserver.fullname" . }} -spec: - # the number of InstanceServers to keep Ready or Allocated in this Fleet. Defaults to 0 - replicas: {{ .Values.instanceserver.replicaCount }} - # defines how InstanceServers are organised across the cluster. - # Options include: - # "Packed" (default) is aimed at dynamic Kubernetes clusters, such as cloud providers, wherein we want to bin pack - # resources - # "Distributed" is aimed at static Kubernetes clusters, wherein we want to distribute resources across the entire - # cluster - # scheduling: Packed - # a InstanceServer template - see: - # https://agones.dev/site/docs/reference/instanceserver/ for all the options - # strategy: - # The replacement strategy for when the InstanceServer template is changed. Default option is "RollingUpdate", - # "RollingUpdate" will increment by maxSurge value on each iteration, while decrementing by maxUnavailable on each - # iteration, until all InstanceServers have been switched from one version to another. - # "Recreate" terminates all non-allocated InstanceServers, and starts up a new set with the new details to replace them. - # type: RollingUpdate - # Only relevant when `type: RollingUpdate` - # rollingUpdate: - # the amount to increment the new InstanceServers by. Defaults to 25% - # maxSurge: 25% - # the amount to decrements InstanceServers by. Defaults to 25% - # maxUnavailable: 25% - template: - # InstanceServer metadata - metadata: - labels: - {{- include "xrengine.instanceserver.labels" . | nindent 8 }} - # InstanceServer specification - spec: - ports: - - name: default - portPolicy: Dynamic - containerPort: 3031 - protocol: TCP - - name: udp-40000 - portPolicy: Dynamic - containerPort: 40000 - protocol: UDP - - name: udp-40001 - portPolicy: Dynamic - containerPort: 40001 - protocol: UDP - - name: udp-40002 - portPolicy: Dynamic - containerPort: 40002 - protocol: UDP - - name: udp-40003 - portPolicy: Dynamic - containerPort: 40003 - protocol: UDP - - name: udp-40004 - portPolicy: Dynamic - containerPort: 40004 - protocol: UDP - - name: udp-40005 - portPolicy: Dynamic - containerPort: 40005 - protocol: UDP - - name: udp-40006 - portPolicy: Dynamic - containerPort: 40006 - protocol: UDP - - name: udp-40007 - portPolicy: Dynamic - containerPort: 40007 - protocol: UDP - - name: udp-40008 - portPolicy: Dynamic - containerPort: 40008 - protocol: UDP - - name: udp-40009 - portPolicy: Dynamic - containerPort: 40009 - protocol: UDP - - name: udp-40010 - portPolicy: Dynamic - containerPort: 40010 - protocol: UDP - - name: udp-40011 - portPolicy: Dynamic - containerPort: 40011 - protocol: UDP - - name: udp-40012 - portPolicy: Dynamic - containerPort: 40012 - protocol: UDP - - name: udp-40013 - portPolicy: Dynamic - containerPort: 40013 - protocol: UDP - - name: udp-40014 - portPolicy: Dynamic - containerPort: 40014 - protocol: UDP - - name: udp-40015 - portPolicy: Dynamic - containerPort: 40015 - protocol: UDP - - name: udp-40016 - portPolicy: Dynamic - containerPort: 40016 - protocol: UDP - - name: udp-40017 - portPolicy: Dynamic - containerPort: 40017 - protocol: UDP - - name: udp-40018 - portPolicy: Dynamic - containerPort: 40018 - protocol: UDP - - name: udp-40019 - portPolicy: Dynamic - containerPort: 40019 - protocol: UDP - - name: udp-40020 - portPolicy: Dynamic - containerPort: 40020 - protocol: UDP - - name: udp-40021 - portPolicy: Dynamic - containerPort: 40021 - protocol: UDP - - name: udp-40022 - portPolicy: Dynamic - containerPort: 40022 - protocol: UDP - - name: udp-40023 - portPolicy: Dynamic - containerPort: 40023 - protocol: UDP - - name: udp-40024 - portPolicy: Dynamic - containerPort: 40024 - protocol: UDP - - name: udp-40025 - portPolicy: Dynamic - containerPort: 40025 - protocol: UDP - - name: udp-40026 - portPolicy: Dynamic - containerPort: 40026 - protocol: UDP - - name: udp-40027 - portPolicy: Dynamic - containerPort: 40027 - protocol: UDP - - name: udp-40028 - portPolicy: Dynamic - containerPort: 40028 - protocol: UDP - - name: udp-40029 - portPolicy: Dynamic - containerPort: 40029 - protocol: UDP - - name: udp-40030 - portPolicy: Dynamic - containerPort: 40030 - protocol: UDP - - name: udp-40031 - portPolicy: Dynamic - containerPort: 40031 - protocol: UDP - - name: udp-40032 - portPolicy: Dynamic - containerPort: 40032 - protocol: UDP - - name: udp-40033 - portPolicy: Dynamic - containerPort: 40033 - protocol: UDP - - name: udp-40034 - portPolicy: Dynamic - containerPort: 40034 - protocol: UDP - - name: udp-40035 - portPolicy: Dynamic - containerPort: 40035 - protocol: UDP - - name: udp-40036 - portPolicy: Dynamic - containerPort: 40036 - protocol: UDP - - name: udp-40037 - portPolicy: Dynamic - containerPort: 40037 - protocol: UDP - - name: udp-40038 - portPolicy: Dynamic - containerPort: 40038 - protocol: UDP - - name: udp-40039 - portPolicy: Dynamic - containerPort: 40039 - protocol: UDP - - name: udp-40040 - portPolicy: Dynamic - containerPort: 40040 - protocol: UDP - - name: udp-40041 - portPolicy: Dynamic - containerPort: 40041 - protocol: UDP - - name: udp-40042 - portPolicy: Dynamic - containerPort: 40042 - protocol: UDP - - name: udp-40043 - portPolicy: Dynamic - containerPort: 40043 - protocol: UDP - - name: udp-40044 - portPolicy: Dynamic - containerPort: 40044 - protocol: UDP - - name: udp-40045 - portPolicy: Dynamic - containerPort: 40045 - protocol: UDP - - name: udp-40046 - portPolicy: Dynamic - containerPort: 40046 - protocol: UDP - - name: udp-40047 - portPolicy: Dynamic - containerPort: 40047 - protocol: UDP - - name: udp-40048 - portPolicy: Dynamic - containerPort: 40048 - protocol: UDP - - name: udp-40049 - portPolicy: Dynamic - containerPort: 40049 - protocol: UDP - - name: udp-40050 - portPolicy: Dynamic - containerPort: 40050 - protocol: UDP - - name: udp-40051 - portPolicy: Dynamic - containerPort: 40051 - protocol: UDP - - name: udp-40052 - portPolicy: Dynamic - containerPort: 40052 - protocol: UDP - - name: udp-40053 - portPolicy: Dynamic - containerPort: 40053 - protocol: UDP - - name: udp-40054 - portPolicy: Dynamic - containerPort: 40054 - protocol: UDP - - name: udp-40055 - portPolicy: Dynamic - containerPort: 40055 - protocol: UDP - - name: udp-40056 - portPolicy: Dynamic - containerPort: 40056 - protocol: UDP - - name: udp-40057 - portPolicy: Dynamic - containerPort: 40057 - protocol: UDP - - name: udp-40058 - portPolicy: Dynamic - containerPort: 40058 - protocol: UDP - - name: udp-40059 - portPolicy: Dynamic - containerPort: 40059 - protocol: UDP - - name: udp-40060 - portPolicy: Dynamic - containerPort: 40060 - protocol: UDP - - name: udp-40061 - portPolicy: Dynamic - containerPort: 40061 - protocol: UDP - - name: udp-40062 - portPolicy: Dynamic - containerPort: 40062 - protocol: UDP - - name: udp-40063 - portPolicy: Dynamic - containerPort: 40063 - protocol: UDP - - name: udp-40064 - portPolicy: Dynamic - containerPort: 40064 - protocol: UDP - - name: udp-40065 - portPolicy: Dynamic - containerPort: 40065 - protocol: UDP - - name: udp-40066 - portPolicy: Dynamic - containerPort: 40066 - protocol: UDP - - name: udp-40067 - portPolicy: Dynamic - containerPort: 40067 - protocol: UDP - - name: udp-40068 - portPolicy: Dynamic - containerPort: 40068 - protocol: UDP - - name: udp-40069 - portPolicy: Dynamic - containerPort: 40069 - protocol: UDP - - name: udp-40070 - portPolicy: Dynamic - containerPort: 40070 - protocol: UDP - - name: udp-40071 - portPolicy: Dynamic - containerPort: 40071 - protocol: UDP - - name: udp-40072 - portPolicy: Dynamic - containerPort: 40072 - protocol: UDP - - name: udp-40073 - portPolicy: Dynamic - containerPort: 40073 - protocol: UDP - - name: udp-40074 - portPolicy: Dynamic - containerPort: 40074 - protocol: UDP - - name: udp-40075 - portPolicy: Dynamic - containerPort: 40075 - protocol: UDP - - name: udp-40076 - portPolicy: Dynamic - containerPort: 40076 - protocol: UDP - - name: udp-40077 - portPolicy: Dynamic - containerPort: 40077 - protocol: UDP - - name: udp-40078 - portPolicy: Dynamic - containerPort: 40078 - protocol: UDP - - name: udp-40079 - portPolicy: Dynamic - containerPort: 40079 - protocol: UDP - - name: udp-40080 - portPolicy: Dynamic - containerPort: 40080 - protocol: UDP - - name: udp-40081 - portPolicy: Dynamic - containerPort: 40081 - protocol: UDP - - name: udp-40082 - portPolicy: Dynamic - containerPort: 40082 - protocol: UDP - - name: udp-40083 - portPolicy: Dynamic - containerPort: 40083 - protocol: UDP - - name: udp-40084 - portPolicy: Dynamic - containerPort: 40084 - protocol: UDP - - name: udp-40085 - portPolicy: Dynamic - containerPort: 40085 - protocol: UDP - - name: udp-40086 - portPolicy: Dynamic - containerPort: 40086 - protocol: UDP - - name: udp-40087 - portPolicy: Dynamic - containerPort: 40087 - protocol: UDP - - name: udp-40088 - portPolicy: Dynamic - containerPort: 40088 - protocol: UDP - - name: udp-40089 - portPolicy: Dynamic - containerPort: 40089 - protocol: UDP - - name: udp-40090 - portPolicy: Dynamic - containerPort: 40090 - protocol: UDP - - name: udp-40091 - portPolicy: Dynamic - containerPort: 40091 - protocol: UDP - - name: udp-40092 - portPolicy: Dynamic - containerPort: 40092 - protocol: UDP - - name: udp-40093 - portPolicy: Dynamic - containerPort: 40093 - protocol: UDP - - name: udp-40094 - portPolicy: Dynamic - containerPort: 40094 - protocol: UDP - - name: udp-40095 - portPolicy: Dynamic - containerPort: 40095 - protocol: UDP - - name: udp-40096 - portPolicy: Dynamic - containerPort: 40096 - protocol: UDP - - name: udp-40097 - portPolicy: Dynamic - containerPort: 40097 - protocol: UDP - - name: udp-40098 - portPolicy: Dynamic - containerPort: 40098 - protocol: UDP - - name: udp-40099 - portPolicy: Dynamic - containerPort: 40099 - protocol: UDP - - name: udp-40100 - portPolicy: Dynamic - containerPort: 40100 - protocol: UDP - - name: udp-40101 - portPolicy: Dynamic - containerPort: 40101 - protocol: UDP - - name: udp-40102 - portPolicy: Dynamic - containerPort: 40102 - protocol: UDP - - name: udp-40103 - portPolicy: Dynamic - containerPort: 40103 - protocol: UDP - - name: udp-40104 - portPolicy: Dynamic - containerPort: 40104 - protocol: UDP - - name: udp-40105 - portPolicy: Dynamic - containerPort: 40105 - protocol: UDP - - name: udp-40106 - portPolicy: Dynamic - containerPort: 40106 - protocol: UDP - - name: udp-40107 - portPolicy: Dynamic - containerPort: 40107 - protocol: UDP - - name: udp-40108 - portPolicy: Dynamic - containerPort: 40108 - protocol: UDP - - name: udp-40109 - portPolicy: Dynamic - containerPort: 40109 - protocol: UDP - - name: udp-40110 - portPolicy: Dynamic - containerPort: 40110 - protocol: UDP - - name: udp-40111 - portPolicy: Dynamic - containerPort: 40111 - protocol: UDP - - name: udp-40112 - portPolicy: Dynamic - containerPort: 40112 - protocol: UDP - - name: udp-40113 - portPolicy: Dynamic - containerPort: 40113 - protocol: UDP - - name: udp-40114 - portPolicy: Dynamic - containerPort: 40114 - protocol: UDP - - name: udp-40115 - portPolicy: Dynamic - containerPort: 40115 - protocol: UDP - - name: udp-40116 - portPolicy: Dynamic - containerPort: 40116 - protocol: UDP - - name: udp-40117 - portPolicy: Dynamic - containerPort: 40117 - protocol: UDP - - name: udp-40118 - portPolicy: Dynamic - containerPort: 40118 - protocol: UDP - - name: udp-40119 - portPolicy: Dynamic - containerPort: 40119 - protocol: UDP - - name: udp-40120 - portPolicy: Dynamic - containerPort: 40120 - protocol: UDP - - name: udp-40121 - portPolicy: Dynamic - containerPort: 40121 - protocol: UDP - - name: udp-40122 - portPolicy: Dynamic - containerPort: 40122 - protocol: UDP - - name: udp-40123 - portPolicy: Dynamic - containerPort: 40123 - protocol: UDP - - name: udp-40124 - portPolicy: Dynamic - containerPort: 40124 - protocol: UDP - - name: udp-40125 - portPolicy: Dynamic - containerPort: 40125 - protocol: UDP - - name: udp-40126 - portPolicy: Dynamic - containerPort: 40126 - protocol: UDP - - name: udp-40127 - portPolicy: Dynamic - containerPort: 40127 - protocol: UDP - - name: udp-40128 - portPolicy: Dynamic - containerPort: 40128 - protocol: UDP - - name: udp-40129 - portPolicy: Dynamic - containerPort: 40129 - protocol: UDP - - name: udp-40130 - portPolicy: Dynamic - containerPort: 40130 - protocol: UDP - - name: udp-40131 - portPolicy: Dynamic - containerPort: 40131 - protocol: UDP - - name: udp-40132 - portPolicy: Dynamic - containerPort: 40132 - protocol: UDP - - name: udp-40133 - portPolicy: Dynamic - containerPort: 40133 - protocol: UDP - - name: udp-40134 - portPolicy: Dynamic - containerPort: 40134 - protocol: UDP - - name: udp-40135 - portPolicy: Dynamic - containerPort: 40135 - protocol: UDP - - name: udp-40136 - portPolicy: Dynamic - containerPort: 40136 - protocol: UDP - - name: udp-40137 - portPolicy: Dynamic - containerPort: 40137 - protocol: UDP - - name: udp-40138 - portPolicy: Dynamic - containerPort: 40138 - protocol: UDP - - name: udp-40139 - portPolicy: Dynamic - containerPort: 40139 - protocol: UDP - - name: udp-40140 - portPolicy: Dynamic - containerPort: 40140 - protocol: UDP - - name: udp-40141 - portPolicy: Dynamic - containerPort: 40141 - protocol: UDP - - name: udp-40142 - portPolicy: Dynamic - containerPort: 40142 - protocol: UDP - - name: udp-40143 - portPolicy: Dynamic - containerPort: 40143 - protocol: UDP - - name: udp-40144 - portPolicy: Dynamic - containerPort: 40144 - protocol: UDP - - name: udp-40145 - portPolicy: Dynamic - containerPort: 40145 - protocol: UDP - - name: udp-40146 - portPolicy: Dynamic - containerPort: 40146 - protocol: UDP - - name: udp-40147 - portPolicy: Dynamic - containerPort: 40147 - protocol: UDP - - name: udp-40148 - portPolicy: Dynamic - containerPort: 40148 - protocol: UDP - - name: udp-40149 - portPolicy: Dynamic - containerPort: 40149 - protocol: UDP - - name: udp-40150 - portPolicy: Dynamic - containerPort: 40150 - protocol: UDP - - name: udp-40151 - portPolicy: Dynamic - containerPort: 40151 - protocol: UDP - - name: udp-40152 - portPolicy: Dynamic - containerPort: 40152 - protocol: UDP - - name: udp-40153 - portPolicy: Dynamic - containerPort: 40153 - protocol: UDP - - name: udp-40154 - portPolicy: Dynamic - containerPort: 40154 - protocol: UDP - - name: udp-40155 - portPolicy: Dynamic - containerPort: 40155 - protocol: UDP - - name: udp-40156 - portPolicy: Dynamic - containerPort: 40156 - protocol: UDP - - name: udp-40157 - portPolicy: Dynamic - containerPort: 40157 - protocol: UDP - - name: udp-40158 - portPolicy: Dynamic - containerPort: 40158 - protocol: UDP - - name: udp-40159 - portPolicy: Dynamic - containerPort: 40159 - protocol: UDP - - name: udp-40160 - portPolicy: Dynamic - containerPort: 40160 - protocol: UDP - - name: udp-40161 - portPolicy: Dynamic - containerPort: 40161 - protocol: UDP - - name: udp-40162 - portPolicy: Dynamic - containerPort: 40162 - protocol: UDP - - name: udp-40163 - portPolicy: Dynamic - containerPort: 40163 - protocol: UDP - - name: udp-40164 - portPolicy: Dynamic - containerPort: 40164 - protocol: UDP - - name: udp-40165 - portPolicy: Dynamic - containerPort: 40165 - protocol: UDP - - name: udp-40166 - portPolicy: Dynamic - containerPort: 40166 - protocol: UDP - - name: udp-40167 - portPolicy: Dynamic - containerPort: 40167 - protocol: UDP - - name: udp-40168 - portPolicy: Dynamic - containerPort: 40168 - protocol: UDP - - name: udp-40169 - portPolicy: Dynamic - containerPort: 40169 - protocol: UDP - - name: udp-40170 - portPolicy: Dynamic - containerPort: 40170 - protocol: UDP - - name: udp-40171 - portPolicy: Dynamic - containerPort: 40171 - protocol: UDP - - name: udp-40172 - portPolicy: Dynamic - containerPort: 40172 - protocol: UDP - - name: udp-40173 - portPolicy: Dynamic - containerPort: 40173 - protocol: UDP - - name: udp-40174 - portPolicy: Dynamic - containerPort: 40174 - protocol: UDP - - name: udp-40175 - portPolicy: Dynamic - containerPort: 40175 - protocol: UDP - - name: udp-40176 - portPolicy: Dynamic - containerPort: 40176 - protocol: UDP - - name: udp-40177 - portPolicy: Dynamic - containerPort: 40177 - protocol: UDP - - name: udp-40178 - portPolicy: Dynamic - containerPort: 40178 - protocol: UDP - - name: udp-40179 - portPolicy: Dynamic - containerPort: 40179 - protocol: UDP - - name: udp-40180 - portPolicy: Dynamic - containerPort: 40180 - protocol: UDP - - name: udp-40181 - portPolicy: Dynamic - containerPort: 40181 - protocol: UDP - - name: udp-40182 - portPolicy: Dynamic - containerPort: 40182 - protocol: UDP - - name: udp-40183 - portPolicy: Dynamic - containerPort: 40183 - protocol: UDP - - name: udp-40184 - portPolicy: Dynamic - containerPort: 40184 - protocol: UDP - - name: udp-40185 - portPolicy: Dynamic - containerPort: 40185 - protocol: UDP - - name: udp-40186 - portPolicy: Dynamic - containerPort: 40186 - protocol: UDP - - name: udp-40187 - portPolicy: Dynamic - containerPort: 40187 - protocol: UDP - - name: udp-40188 - portPolicy: Dynamic - containerPort: 40188 - protocol: UDP - - name: udp-40189 - portPolicy: Dynamic - containerPort: 40189 - protocol: UDP - - name: udp-40190 - portPolicy: Dynamic - containerPort: 40190 - protocol: UDP - - name: udp-40191 - portPolicy: Dynamic - containerPort: 40191 - protocol: UDP - - name: udp-40192 - portPolicy: Dynamic - containerPort: 40192 - protocol: UDP - - name: udp-40193 - portPolicy: Dynamic - containerPort: 40193 - protocol: UDP - - name: udp-40194 - portPolicy: Dynamic - containerPort: 40194 - protocol: UDP - - name: udp-40195 - portPolicy: Dynamic - containerPort: 40195 - protocol: UDP - - name: udp-40196 - portPolicy: Dynamic - containerPort: 40196 - protocol: UDP - - name: udp-40197 - portPolicy: Dynamic - containerPort: 40197 - protocol: UDP - - name: udp-40198 - portPolicy: Dynamic - containerPort: 40198 - protocol: UDP - - name: udp-40199 - portPolicy: Dynamic - containerPort: 40199 - protocol: UDP - health: - initialDelaySeconds: 10 - periodSeconds: 15 - # Parameters for game server sidecar - # sdkServer: - # sdkServer log level parameter has three options: - # - "Info" (default) The SDK server will output all messages except for debug messages - # - "Debug" The SDK server will output all messages including debug messages - # - "Error" The SDK server will only output error messages - # logLevel: Info - # The InstanceServer's Pod template - template: - spec: - serviceAccountName: {{ include "xrengine.instanceserver.serviceAccountName" . }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ include "xrengine.instanceserver.fullname" . }} - image: "{{ .Values.instanceserver.image.repository }}:{{ .Values.instanceserver.image.tag }}" - imagePullPolicy: {{ .Values.instanceserver.image.pullPolicy }} - - {{- with .Values.instanceserver.resources }} - resources: - {{- toYaml . | nindent 16 }} - {{- end }} - envFrom: - - configMapRef: - name: {{ include "xrengine.instanceserver.fullname" . }} - optional: true - - env: - - name: SERVER_MODE - value: "realtime" - - name: KUBERNETES - value: "true" - {{ if .Values.sql }} - - name: MYSQL_USER - value: {{ .Values.sql.user }} - - name: MYSQL_DATABASE - value: {{ .Values.sql.database }} - - name: MYSQL_PASSWORD - value: {{ .Values.sql.password | quote }} - - name: MYSQL_HOST - value: {{ .Values.sql.host | quote }} - - name: MYSQL_PORT - value: {{ .Values.sql.port | quote }} - {{ else if .Values.mariadb }} - - name: MYSQL_USER - value: {{ .Values.mariadb.db.user }} - - name: MYSQL_DATABASE - value: {{ .Values.mariadb.db.name }} - - name: MYSQL_PASSWORD - {{- if not .Values.mariadb.enabled }} - value: {{ .Values.mariadb.db.password | quote }} - {{- else }} - valueFrom: - secretKeyRef: - {{- if .Values.mariadb.existingSecret }} - name: {{ .Values.mariadb.existingSecret }} - {{- else }} - name: {{ template "xrengine.mariadb.fullname" . }} - {{- end }} - key: mariadb-password - {{- end }} - - name: MYSQL_HOST - value: {{ .Values.mariadb.externalHost }} - - name: MYSQL_PORT - value: {{ .Values.mariadb.externalPort | quote }} - {{ else }} - - name: MYSQL_USER - value: server - - name: MYSQL_DATABASE - value: xrengine - - name: MYSQL_PASSWORD - value: password - - name: MYSQL_HOST - value: host.minikube.internal - - name: MYSQL_PORT - value: 3306 - {{ end }} - - name: REDIS_ENABLED - value: "true" - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - - name: RELEASE_NAME - value: {{ $releaseName }} - initContainers: - - name: init-redis - image: busybox:1.28 - command: ['sh', '-c', 'until (printf "AUTH $REDIS_PASSWORD\r\nPING\r\n";) | nc $REDIS_ADDRESS $REDIS_PORT ; do echo waiting for redis-master; sleep 2; done'] - env: - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - {{- with .Values.instanceserver.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.instanceserver.affinity }} - affinity: - {{- toYaml . | nindent 12 }} - {{- end }} -{{- end }} - - diff --git a/packages/ops/xrengine/templates/instance-server-ingress.yaml b/packages/ops/xrengine/templates/instance-server-ingress.yaml deleted file mode 100755 index 496bdb1113..0000000000 --- a/packages/ops/xrengine/templates/instance-server-ingress.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if and (.Values.instanceserver).enabled (ne (((.Values.instanceserver).ingress).disabled | default "") "true") -}} -{{- $fullName := include "xrengine.instanceserver.fullname" . -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "xrengine.instanceserver.labels" . | nindent 4 }} - {{- with ((.Values.instanceserver).ingress).annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - rules: - - host: {{ ((.Values.instanceserver).ingress).host }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: 3031 -{{- end }} \ No newline at end of file diff --git a/packages/ops/xrengine/templates/instance-server-serviceaccount.yaml b/packages/ops/xrengine/templates/instance-server-serviceaccount.yaml deleted file mode 100755 index 3768b7052c..0000000000 --- a/packages/ops/xrengine/templates/instance-server-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and (.Values.instanceserver).enabled ((.Values.instanceserver).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.instanceserver.serviceAccountName" . }} - labels: - {{- include "xrengine.instanceserver.labels" . | nindent 4 }} - {{- with .Values.instanceserver.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/media-server-configmap.yaml b/packages/ops/xrengine/templates/media-server-configmap.yaml deleted file mode 100755 index df22fc6054..0000000000 --- a/packages/ops/xrengine/templates/media-server-configmap.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if (.Values.media).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.media.fullname" . }} - labels: - {{- include "xrengine.media.labels" . | nindent 4 }} -data: -{{- if .Values.media.extraEnv }} -{{ toYaml .Values.media.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.media.config }} - NODE_CONFIG: '{{ mustToJson .Values.media.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/media-server-deployment.yaml b/packages/ops/xrengine/templates/media-server-deployment.yaml deleted file mode 100755 index 42be9ee873..0000000000 --- a/packages/ops/xrengine/templates/media-server-deployment.yaml +++ /dev/null @@ -1,138 +0,0 @@ -{{- if (.Values.media).enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xrengine.media.fullname" . }} - labels: - {{- include "xrengine.media.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.media.replicaCount }} - selector: - matchLabels: - {{- include "xrengine.media.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "xrengine.media.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/media-server-configmap.yaml") . | sha256sum }} - spec: - {{- with .Values.media.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.media.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.media.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.media.securityContext | nindent 12 }} - image: "{{ .Values.media.image.repository }}:{{ .Values.media.image.tag }}" - imagePullPolicy: {{ .Values.media.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.media.fullname" . }} - optional: true - - configMapRef: - name: {{ include "xrengine.api.fullname" . }} - optional: true - env: - - name: SERVER_MODE - value: "media" - - name: KUBERNETES - value: "true" - {{ if .Values.mariadb }} - - name: MYSQL_USER - value: {{ .Values.mariadb.db.user }} - - name: MYSQL_DATABASE - value: {{ .Values.mariadb.db.name }} - - name: MYSQL_PASSWORD - {{- if not .Values.mariadb.enabled }} - value: {{ .Values.mariadb.db.password | quote }} - {{- else }} - valueFrom: - secretKeyRef: - {{- if .Values.mariadb.existingSecret }} - name: {{ .Values.mariadb.existingSecret }} - {{- else }} - name: {{ template "xrengine.mariadb.fullname" . }} - {{- end }} - key: mariadb-password - {{- end }} - - name: MYSQL_HOST - value: {{ .Values.mariadb.externalHost }} - - name: MYSQL_PORT - value: {{ .Values.mariadb.externalPort | quote }} - {{ else }} - - name: MYSQL_USER - value: {{ .Values.sql.user }} - - name: MYSQL_DATABASE - value: {{ .Values.sql.database }} - - name: MYSQL_PASSWORD - value: {{ .Values.sql.password | quote }} - - name: MYSQL_HOST - value: {{ .Values.sql.host | quote }} - - name: MYSQL_PORT - value: {{ .Values.sql.port | quote }} - {{ end }} - - name: REDIS_ENABLED - value: "true" - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - - name: RELEASE_NAME - value: {{ $releaseName }} - ports: - - name: http - containerPort: 3030 - protocol: TCP - livenessProbe: - httpGet: - path: /healthcheck - port: http - initialDelaySeconds: 10 - readinessProbe: - httpGet: - path: /healthcheck - port: http - initialDelaySeconds: 10 - resources: - {{- toYaml .Values.media.resources | nindent 12 }} - initContainers: - - name: init-redis - image: busybox:1.28 - command: [ 'sh', '-c', 'until (printf "AUTH $REDIS_PASSWORD\r\nPING\r\n";) | nc $REDIS_ADDRESS $REDIS_PORT ; do echo waiting for redis-master; sleep 2; done' ] - env: - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - {{- with .Values.media.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.media.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.media.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/media-server-ingress.yaml b/packages/ops/xrengine/templates/media-server-ingress.yaml deleted file mode 100755 index 8133da080a..0000000000 --- a/packages/ops/xrengine/templates/media-server-ingress.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{{- if and (.Values.media).enabled (ne (.Values.media.ingress.disabled | default "") "true") -}} -{{- $fullName := include "xrengine.media.fullname" . -}} -{{- $svcPort := .Values.media.service.port -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "xrengine.media.labels" . | nindent 4 }} - {{- with .Values.media.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: -{{- if .Values.media.ingress.tls }} - tls: - {{- range .Values.media.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.media.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ . }} - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- end }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/media-server-service.yaml b/packages/ops/xrengine/templates/media-server-service.yaml deleted file mode 100755 index ba4cb9ce16..0000000000 --- a/packages/ops/xrengine/templates/media-server-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if (.Values.media).enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xrengine.media.fullname" . }} - labels: - {{- include "xrengine.media.labels" . | nindent 4 }} -spec: - type: {{ .Values.media.service.type }} - ports: - - port: {{ .Values.media.service.port }} - targetPort: {{ .Values.media.service.port }} - protocol: TCP - name: http - selector: - {{- include "xrengine.media.selectorLabels" . | nindent 4 }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/media-server-serviceaccount.yaml b/packages/ops/xrengine/templates/media-server-serviceaccount.yaml deleted file mode 100755 index 127cf9f065..0000000000 --- a/packages/ops/xrengine/templates/media-server-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and (.Values.media).enabled ((.Values.media).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.media.serviceAccountName" . }} - labels: - {{- include "xrengine.media.labels" . | nindent 4 }} - {{- with .Values.media.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/task-server-cluster-role-binding.yaml b/packages/ops/xrengine/templates/task-server-cluster-role-binding.yaml deleted file mode 100755 index 76895b8316..0000000000 --- a/packages/ops/xrengine/templates/task-server-cluster-role-binding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.taskserver).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine.taskserver.fullname" . }} - labels: - {{- include "xrengine.taskserver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine.taskserver.serviceAccountName" . }} - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine.taskserver.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/task-server-cluster-role.yaml b/packages/ops/xrengine/templates/task-server-cluster-role.yaml deleted file mode 100755 index cd47a84480..0000000000 --- a/packages/ops/xrengine/templates/task-server-cluster-role.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if (.Values.taskserver).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine.taskserver.fullname" . }} - labels: - {{- include "xrengine.taskserver.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - endpoints - verbs: - - get - - list - - watch - - apiGroups: - - "agones.dev" - resources: - - fleets - - fleet - - fleets.agones.dev - - gameservers - - gameserver - - gameservers.agones.dev - - gameserversets - verbs: - - get - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine/templates/task-server-configmap.yaml b/packages/ops/xrengine/templates/task-server-configmap.yaml deleted file mode 100755 index 8c43df71dc..0000000000 --- a/packages/ops/xrengine/templates/task-server-configmap.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if (.Values.taskserver).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.taskserver.fullname" . }} - labels: - {{- include "xrengine.taskserver.labels" . | nindent 4 }} -data: -{{- if .Values.taskserver.extraEnv }} -{{ toYaml .Values.taskserver.extraEnv | indent 2 }} -{{- end }} -{{- if .Values.taskserver.config }} - NODE_CONFIG: '{{ mustToJson .Values.taskserver.config }}' -{{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/task-server-deployment.yaml b/packages/ops/xrengine/templates/task-server-deployment.yaml deleted file mode 100755 index 368e4b020b..0000000000 --- a/packages/ops/xrengine/templates/task-server-deployment.yaml +++ /dev/null @@ -1,132 +0,0 @@ -{{- if (.Values.taskserver).enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xrengine.taskserver.fullname" . }} - labels: - {{- include "xrengine.taskserver.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.taskserver.replicaCount }} - selector: - matchLabels: - {{- include "xrengine.taskserver.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "xrengine.taskserver.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/task-server-configmap.yaml") . | sha256sum }} - spec: - {{- with .Values.taskserver.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.taskserver.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.taskserver.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.taskserver.securityContext | nindent 12 }} - image: "{{ .Values.taskserver.image.repository }}:{{ .Values.taskserver.image.tag }}" - imagePullPolicy: {{ .Values.taskserver.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.taskserver.fullname" . }} - optional: true - env: - - name: SERVER_MODE - value: "task" - - name: KUBERNETES - value: "true" - {{ if .Values.sql }} - - name: MYSQL_USER - value: {{ .Values.sql.user }} - - name: MYSQL_DATABASE - value: {{ .Values.sql.database }} - - name: MYSQL_PASSWORD - value: {{ .Values.sql.password | quote }} - - name: MYSQL_HOST - value: {{ .Values.sql.host | quote }} - - name: MYSQL_PORT - value: {{ .Values.sql.port | quote }} - {{ else if .Values.mariadb }} - - name: MYSQL_USER - value: {{ .Values.mariadb.db.user }} - - name: MYSQL_DATABASE - value: {{ .Values.mariadb.db.name }} - - name: MYSQL_PASSWORD - {{- if not .Values.mariadb.enabled }} - value: {{ .Values.mariadb.db.password | quote }} - {{- else }} - valueFrom: - secretKeyRef: - {{- if .Values.mariadb.existingSecret }} - name: {{ .Values.mariadb.existingSecret }} - {{- else }} - name: {{ template "xrengine.mariadb.fullname" . }} - {{- end }} - key: mariadb-password - {{- end }} - - name: MYSQL_HOST - value: {{ .Values.mariadb.externalHost }} - - name: MYSQL_PORT - value: {{ .Values.mariadb.externalPort | quote }} - {{ else }} - - name: MYSQL_USER - value: server - - name: MYSQL_DATABASE - value: xrengine - - name: MYSQL_PASSWORD - value: password - - name: MYSQL_HOST - value: host.minikube.internal - - name: MYSQL_PORT - value: 3306 - {{ end }} - - name: REDIS_ENABLED - value: "true" - - name: REDIS_ADDRESS - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_HOST)" - - name: REDIS_PORT - value: "$({{ $releaseName | upper }}_REDIS_MASTER_SERVICE_PORT)" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $releaseName }}-redis - key: redis-password - - name: RELEASE_NAME - value: {{ $releaseName }} - ports: - - name: http - containerPort: 3030 - protocol: TCP - livenessProbe: - httpGet: - path: /healthcheck - port: http - initialDelaySeconds: 10 - readinessProbe: - httpGet: - path: /healthcheck - port: http - initialDelaySeconds: 10 - resources: - {{- toYaml .Values.taskserver.resources | nindent 12 }} - {{- with .Values.taskserver.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.taskserver.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.taskserver.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/task-server-service.yaml b/packages/ops/xrengine/templates/task-server-service.yaml deleted file mode 100755 index 2f97cb387c..0000000000 --- a/packages/ops/xrengine/templates/task-server-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if (.Values.taskserver).enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xrengine.taskserver.fullname" . }} - labels: - {{- include "xrengine.taskserver.labels" . | nindent 4 }} -spec: - type: {{ .Values.taskserver.service.type }} - ports: - - port: {{ .Values.taskserver.service.port }} - targetPort: {{ .Values.taskserver.service.port }} - protocol: TCP - name: http - selector: - {{- include "xrengine.taskserver.selectorLabels" . | nindent 4 }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/task-server-serviceaccount.yaml b/packages/ops/xrengine/templates/task-server-serviceaccount.yaml deleted file mode 100755 index 5932be6080..0000000000 --- a/packages/ops/xrengine/templates/task-server-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and (.Values.taskserver).enabled ((.Values.taskserver).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.taskserver.serviceAccountName" . }} - labels: - {{- include "xrengine.taskserver.labels" . | nindent 4 }} - {{- with .Values.taskserver.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/test-bot-cluster-role-binding.yaml b/packages/ops/xrengine/templates/test-bot-cluster-role-binding.yaml deleted file mode 100755 index a7f74c5949..0000000000 --- a/packages/ops/xrengine/templates/test-bot-cluster-role-binding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if (.Values.testbot).enabled -}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "xrengine.testbot.fullname" . }} - labels: - {{- include "xrengine.testbot.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "xrengine.testbot.serviceAccountName" . }} - namespace: default -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "xrengine.testbot.fullname" . }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/test-bot-cluster-role.yaml b/packages/ops/xrengine/templates/test-bot-cluster-role.yaml deleted file mode 100755 index f5d803697f..0000000000 --- a/packages/ops/xrengine/templates/test-bot-cluster-role.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if (.Values.testbot).enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "xrengine.testbot.fullname" . }} - labels: - {{- include "xrengine.testbot.labels" . | nindent 4 }} -rules: - - apiGroups: - - "" - resources: - - pods - - endpoints - - deployments - verbs: - - get - - list - - watch - - apiGroups: - - "apps" - resources: - - deployments - verbs: - - get - - list - - watch - - apiGroups: - - "agones.dev" - resources: - - fleets - - fleet - - fleets.agones.dev - - gameservers - - gameserver - - gameservers.agones.dev - - gameserversets - verbs: - - get - - list - - watch -{{- end }} diff --git a/packages/ops/xrengine/templates/test-bot-configmap.yaml b/packages/ops/xrengine/templates/test-bot-configmap.yaml deleted file mode 100755 index 83101c40bd..0000000000 --- a/packages/ops/xrengine/templates/test-bot-configmap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if (.Values.testbot).enabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "xrengine.testbot.fullname" . }} - labels: - {{- include "xrengine.testbot.labels" . | nindent 4 }} -data: -{{- if .Values.testbot.extraEnv }} -{{ toYaml .Values.testbot.extraEnv | indent 2 }} -{{- end }} -{{- end }} diff --git a/packages/ops/xrengine/templates/test-bot-job.yaml b/packages/ops/xrengine/templates/test-bot-job.yaml deleted file mode 100644 index bb64f6a902..0000000000 --- a/packages/ops/xrengine/templates/test-bot-job.yaml +++ /dev/null @@ -1,159 +0,0 @@ -{{- if (.Values.testbot).enabled -}} -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ include "xrengine.testbot.fullname" . }} - labels: - {{- include "xrengine.testbot.labels" . | nindent 4 }} -spec: - suspend: {{ .Values.testbot.suspend }} - backoffLimit: 0 - template: - metadata: - labels: - {{- include "xrengine.testbot.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/test-bot-configmap.yaml") . | sha256sum }} - spec: - restartPolicy: Never - {{- with .Values.testbot.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xrengine.testbot.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.testbot.podSecurityContext | nindent 8 }} - {{- $releaseName := .Release.Name }} - {{ if not (empty .Values.release) }} - {{- $releaseName = .Values.release.name | default .Release.Name }} - {{ end }} - initContainers: - - name: init-engine - image: bitnami/kubectl - imagePullPolicy: IfNotPresent - command: - - /bin/sh - - -exc - - | - apiName="${RELEASE_NAME}-xrengine-api" - clientName="${RELEASE_NAME}-xrengine-client" - instanceserverName="${RELEASE_NAME}-instanceserver" - - apiCount=$(kubectl get deploy $apiName -o jsonpath='{.status.availableReplicas}') - echo "API ready count: $apiCount" - - # Wait until api count is 1. - until [ $apiCount -ge 1 ] - do - sleep 5 - - apiCount=$(kubectl get deploy $apiName -o jsonpath='{.status.availableReplicas}') - echo "API ready count: $apiCount" - done - - clientCount=$(kubectl get deploy $clientName -o jsonpath='{.status.availableReplicas}') - echo "Client ready count: $clientCount" - - # Wait until client count is 1. - until [ $clientCount -ge 1 ] - do - sleep 5 - - clientCount=$(kubectl get deploy $clientName -o jsonpath='{.status.availableReplicas}') - echo "Client ready count: $clientCount" - done - - instanceserverCount=$(kubectl get fleet $instanceserverName -o jsonpath='{.status.readyReplicas}') - echo "Instanceserver ready count: $instanceserverCount" - - # Wait until instanceserver count is 1. - until [ $instanceserverCount -ge 1 ] - do - sleep 5 - - instanceserverCount=$(kubectl get fleet $instanceserverName -o jsonpath='{.status.readyReplicas}') - echo "Instanceserver ready count: $instanceserverCount" - done - - echo "XREngine is now ready" - exit 0 - env: - - name: RELEASE_NAME - value: {{ .Release.Name }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.testbot.securityContext | nindent 12 }} - image: "{{ .Values.testbot.image.repository }}:{{ .Values.testbot.image.tag }}" - imagePullPolicy: {{ .Values.testbot.image.pullPolicy }} - envFrom: - - configMapRef: - name: {{ include "xrengine.testbot.fullname" . }} - optional: true - env: - - name: SERVER_MODE - value: "client" - - name: KUBERNETES - value: "true" - {{ if .Values.sql }} - - name: MYSQL_USER - value: {{ .Values.sql.user }} - - name: MYSQL_DATABASE - value: {{ .Values.sql.database }} - - name: MYSQL_PASSWORD - value: {{ .Values.sql.password | quote }} - - name: MYSQL_HOST - value: {{ .Values.sql.host | quote }} - - name: MYSQL_PORT - value: {{ .Values.sql.port | quote }} - {{ else if .Values.mariadb }} - - name: MYSQL_USER - value: {{ .Values.mariadb.db.user }} - - name: MYSQL_DATABASE - value: {{ .Values.mariadb.db.name }} - - name: MYSQL_PASSWORD - {{- if not .Values.mariadb.enabled }} - value: {{ .Values.mariadb.db.password | quote }} - {{- else }} - valueFrom: - secretKeyRef: - {{- if .Values.mariadb.existingSecret }} - name: {{ .Values.mariadb.existingSecret }} - {{- else }} - name: {{ template "xrengine.mariadb.fullname" . }} - {{- end }} - key: mariadb-password - {{- end }} - - name: MYSQL_HOST - value: {{ .Values.mariadb.externalHost }} - - name: MYSQL_PORT - value: {{ .Values.mariadb.externalPort | quote }} - {{ else }} - - name: MYSQL_USER - value: server - - name: MYSQL_DATABASE - value: xrengine - - name: MYSQL_PASSWORD - value: password - - name: MYSQL_HOST - value: host.minikube.internal - - name: MYSQL_PORT - value: 3306 - {{ end }} - - name: RELEASE_NAME - value: {{ $releaseName }} - resources: - {{- toYaml .Values.testbot.resources | nindent 12 }} - {{- with .Values.testbot.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.testbot.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.testbot.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/packages/ops/xrengine/templates/test-bot-serviceaccount.yaml b/packages/ops/xrengine/templates/test-bot-serviceaccount.yaml deleted file mode 100755 index 06e23f40f8..0000000000 --- a/packages/ops/xrengine/templates/test-bot-serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and (.Values.testbot).enabled ((.Values.testbot).serviceAccount).create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xrengine.testbot.serviceAccountName" . }} - labels: - {{- include "xrengine.testbot.labels" . | nindent 4 }} - {{- with .Values.testbot.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/packages/ops/xrengine/templates/tests/test-connection.yaml b/packages/ops/xrengine/templates/tests/test-connection.yaml deleted file mode 100755 index 32ce93650f..0000000000 --- a/packages/ops/xrengine/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "xrengine.client.fullname" . }}-test-connection" - labels: - {{- include "xrengine.client.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "xrengine.client.fullname" . }}:{{ .Values.client.service.port }}'] - restartPolicy: Never diff --git a/packages/ops/xrengine/values.schema.json b/packages/ops/xrengine/values.schema.json deleted file mode 100755 index 04d114086a..0000000000 --- a/packages/ops/xrengine/values.schema.json +++ /dev/null @@ -1,534 +0,0 @@ -{ - "$schema": "http://json-schema.org/schema#", - "type": "object", - "properties": { - "agones": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - } - }, - "client": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - }, - "domain": { - "type": "string" - }, - "instanceserver": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "tolerations": { - "type": "array" - } - } - }, - "testbot": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - }, - "mariadb": { - "type": "object", - "properties": { - "db": { - "type": "object", - "properties": { - "existingSecret": { - "type": "null" - }, - "name": { - "type": "string" - }, - "password": { - "type": "string" - }, - "user": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "externalHost": { - "type": "string" - }, - "externalPort": { - "type": "integer" - }, - "nameOverride": { - "type": "string" - }, - "replication": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - } - } - } - }, - "server": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - }, - "editor": { - "type": "object", - "properties": { - "affinity": { - "type": "object" - }, - "enabled": { - "type": "boolean" - }, - "extraEnv": { - "type": "object" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { - "type": "object", - "properties": { - "pullPolicy": { - "type": "string" - }, - "repository": { - "type": "string" - }, - "tag": { - "type": "string" - } - } - }, - "imagePullSecrets": { - "type": "array" - }, - "ingress": { - "type": "object", - "properties": { - "annotations": { - "type": "object", - "properties": { - "kubernetes.io/ingress.class": { - "type": "string" - } - } - }, - "enabled": { - "type": "boolean" - }, - "hosts": { - "type": "array", - "items": { - "type": "object", - "properties": { - "host": { - "type": "string" - }, - "paths": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - } - } - }, - "name": { - "type": "string" - }, - "nameOverride": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podSecurityContext": { - "type": "object" - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object" - }, - "securityContext": { - "type": "object" - }, - "service": { - "type": "object", - "properties": { - "port": { - "type": "integer" - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "create": { - "type": "boolean" - }, - "name": { - "type": "null" - } - } - }, - "tolerations": { - "type": "array" - } - } - } - } -} diff --git a/packages/ops/xrengine/values.yaml b/packages/ops/xrengine/values.yaml deleted file mode 100755 index 2281e3b471..0000000000 --- a/packages/ops/xrengine/values.yaml +++ /dev/null @@ -1,326 +0,0 @@ -# Default values for xrengine. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -domain: xrengine.dev - -# This is used to define cluster environment type. Currently its used when deployed in local environment. -# For Minikube set this as "minikube" -# For Microk8s set this as "microk8s" -# For other environments keeps this as empty -clusterType: "" - -client: - enabled: true - name: xrengine-client - - replicaCount: 1 - image: - repository: lagunalabs/xrengine - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - service: - type: ClusterIP - port: 3000 - - ingress: - enabled: true - annotations: - kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: xrsocial.local - paths: ["/"] - # tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - - serviceAccount: - create: true - annotations: {} - name: - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - extraEnv: - SITE_TITLE: Ethereal Engine - SITE_DESC: Connected Worlds for Everyone - APP_ENV: production - -release: - name: dev - -api: - enabled: true - name: xrengine-api - - replicaCount: 1 - image: - repository: lagunalabs/xrengine - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - service: - type: ClusterIP - port: 3030 - - ingress: - enabled: true - annotations: - kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: api.social.local - paths: ["/"] - # tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - - - serviceAccount: - create: true - annotations: {} - name: - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - fileServer: - # This is the path of file server upload folder in your host machine. Its is required when deployed - # in local environment. - # - # For MicroK8s: it will be similar to '/home///packages/server/upload' - # or '/packages/server/upload' - # - # For Minikube: it will be similar to '/hosthome///packages/server/upload' - # The folder must be in home folder and make sure to use /hosthome/ instead of home in path. - # Ref: https://stackoverflow.com/a/48535001/2077741 - hostUploadFolder: "" - - # Extra Environment variables to configure xrsocial - extraEnv: - # ENV_VAR1: val1 - # ENV_VAR2: val2 - - # automatically filled by chart.. ignore - # MYSQL_PORT: 3306 - # MYSQL_DATABASE: xrengine - # MYSQL_USER: server - # MYSQL_PASSWORD: password - - SMTP_HOST: "" - SMTP_PORT: "" - SMTP_USER: "" - SMTP_PASS: "" - - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GITHUB_CALLBACK_URL: http://127.0.0.1:3000/oauth/github - - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FACEBOOK_CALLBACK_URL: http://127.0.0.1:3000/oauth/facebook - - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: http://127.0.0.1:3000/oauth/google - - - STORAGE_PROVIDER: local - STORAGE_S3_BUCKET_NAME: "" - STORAGE_S3_PUBLIC_VIDEO_PATH: "/" - STORAGE_S3_PUBLIC_VIDEO_BUCKET: "" - STORAGE_S3_REGION: "" - STORAGE_S3_CLOUDFRONT_DOMAIN: "" - STORAGE_AWS_ACCESS_KEY_ID: "" - STORAGE_AWS_ACCESS_KEY_SECRET: "" - - AWS_SMS_REGION: "" - AWS_SMS_ACCESS_KEY_ID: "" - AWS_SMS_SECRET_ACCESS_KEY: "" - AWS_SMS_TOPIC_ARN: "" - # SERVER_MODE: "api" - - -media: - enabled: true - name: xrengine-media - - replicaCount: 1 - image: - repository: lagunalabs/xrengine - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - service: - type: ClusterIP - port: 3030 - - ingress: - enabled: true - annotations: - kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: api.xrsocial.local - paths: ["/video"] - # tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - - - serviceAccount: - create: true - annotations: {} - name: - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - # Extra Environment variables to configure xrsocial - extraEnv: - # ENV_VAR1: val1 - # ENV_VAR2: val2 - - # automatically filled by chart.. ignore - # MYSQL_PORT: 3306 - # MYSQL_DATABASE: xrengine - # MYSQL_USER: server - # MYSQL_PASSWORD: password - - SMTP_HOST: "" - SMTP_PORT: "" - SMTP_USER: "" - SMTP_PASS: "" - - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - GITHUB_CALLBACK_URL: http://127.0.0.1:3000/oauth/github - - FACEBOOK_CLIENT_ID: "" - FACEBOOK_CLIENT_SECRET: "" - FACEBOOK_CALLBACK_URL: http://127.0.0.1:3000/oauth/facebook - - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - GOOGLE_CALLBACK_URL: http://127.0.0.1:3000/oauth/google - - - STORAGE_PROVIDER: local - STORAGE_S3_BUCKET_NAME: "" - STORAGE_S3_PUBLIC_VIDEO_PATH: "/" - STORAGE_S3_PUBLIC_VIDEO_BUCKET: "" - STORAGE_S3_REGION: "" - STORAGE_S3_CLOUDFRONT_DOMAIN: "" - STORAGE_AWS_ACCESS_KEY_ID: "" - STORAGE_AWS_ACCESS_KEY_SECRET: "" - - AWS_SMS_REGION: "" - AWS_SMS_ACCESS_KEY_ID: "" - AWS_SMS_SECRET_ACCESS_KEY: "" - AWS_SMS_TOPIC_ARN: "" - # SERVER_MODE: "media" - -instanceserver: - enabled: true - name: instanceserver - - replicaCount: 1 - image: - repository: lagunalabs/xrengine - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - service: - type: ClusterIP - port: 3031 - - serviceAccount: - create: true - annotations: {} - name: - -########### Subcharts - values here will overwrite the subchart - -sql: - database: xrengine - user: server - password: password - host: host.minikube.internal - port: 3304 - -agones: - enabled: false - -redis: - enabled: false - -taskserver: - enabled: false - name: xrengine-taskserver - - replicaCount: 1 - image: - repository: lagunalabs/xrengine - tag: latest - pullPolicy: IfNotPresent - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - resources: {} - nodeSelector: {} - tolerations: [] - affinity: {} - podSecurityContext: {} - securityContext: {} - - service: - type: ClusterIP - port: 3030 - - serviceAccount: - create: true - annotations: {} - name: \ No newline at end of file diff --git a/packages/projects/ProjectConfigInterface.ts b/packages/projects/ProjectConfigInterface.ts index b2963b802e..a0b80baab1 100644 --- a/packages/projects/ProjectConfigInterface.ts +++ b/packages/projects/ProjectConfigInterface.ts @@ -1,6 +1,6 @@ -import { OEmbed } from '@xrengine/common/src/interfaces/OEmbed' -import type { World } from '@xrengine/engine/src/ecs/classes/World' -import type { Application } from '@xrengine/server-core/declarations' +import { OEmbed } from '@etherealengine/common/src/interfaces/OEmbed' +import type { World } from '@etherealengine/engine/src/ecs/classes/World' +import type { Application } from '@etherealengine/server-core/declarations' export interface ProjectConfigInterface { /** diff --git a/packages/projects/createLocations.ts b/packages/projects/createLocations.ts index c5f95682cc..3d93bd42da 100644 --- a/packages/projects/createLocations.ts +++ b/packages/projects/createLocations.ts @@ -4,8 +4,8 @@ import fs from 'fs' import path from 'path' import { v4 as generateUUID } from 'uuid' -import { Location } from '@xrengine/common/src/interfaces/Location' -import { Application } from '@xrengine/server-core/declarations' +import { Location } from '@etherealengine/common/src/interfaces/Location' +import { Application } from '@etherealengine/server-core/declarations' function toCapitalCase(str: string) { return str diff --git a/packages/projects/default-project/projectEventHooks.ts b/packages/projects/default-project/projectEventHooks.ts index d8de9f0862..0d41d17679 100644 --- a/packages/projects/default-project/projectEventHooks.ts +++ b/packages/projects/default-project/projectEventHooks.ts @@ -2,12 +2,12 @@ import { BadRequest } from '@feathersjs/errors' import { Paginated } from '@feathersjs/feathers/lib' import path from 'path' -import { Location } from '@xrengine/common/src/interfaces/Location' -import { OEmbed } from '@xrengine/common/src/interfaces/OEmbed' -import { ProjectEventHooks } from '@xrengine/projects/ProjectConfigInterface' -import { Application } from '@xrengine/server-core/declarations' -import { getStorageProvider } from '@xrengine/server-core/src/media/storageprovider/storageprovider' -import { installAvatarsFromProject } from '@xrengine/server-core/src/user/avatar/avatar-helper' +import { Location } from '@etherealengine/common/src/interfaces/Location' +import { OEmbed } from '@etherealengine/common/src/interfaces/OEmbed' +import { ProjectEventHooks } from '@etherealengine/projects/ProjectConfigInterface' +import { Application } from '@etherealengine/server-core/declarations' +import { getStorageProvider } from '@etherealengine/server-core/src/media/storageprovider/storageprovider' +import { installAvatarsFromProject } from '@etherealengine/server-core/src/user/avatar/avatar-helper' const avatarsFolder = path.resolve(__dirname, 'public/avatars') diff --git a/packages/projects/default-project/readme.md b/packages/projects/default-project/readme.md index f14c7afa78..15dab9e70d 100644 --- a/packages/projects/default-project/readme.md +++ b/packages/projects/default-project/readme.md @@ -1,3 +1,3 @@ -### XREngine Project +### Ethereal Engine Project -This is the xrengine default project. It contains some basic starter assets, avatars and scenes. \ No newline at end of file +This is the Ethereal Engine default project. It contains some basic starter assets, avatars and scenes. \ No newline at end of file diff --git a/packages/projects/default-project/xrengine.config.ts b/packages/projects/default-project/xrengine.config.ts index e4e4e08b05..53ed1cc813 100644 --- a/packages/projects/default-project/xrengine.config.ts +++ b/packages/projects/default-project/xrengine.config.ts @@ -1,32 +1,32 @@ -import type { ProjectConfigInterface } from '@xrengine/projects/ProjectConfigInterface' +import type { ProjectConfigInterface } from '@etherealengine/projects/ProjectConfigInterface' const config: ProjectConfigInterface = { onEvent: './projectEventHooks.ts', thumbnail: '/static/etherealengine.png', routes: { '/': { - component: () => import('@xrengine/client/src/pages/index'), + component: () => import('@etherealengine/client/src/pages/index'), props: { exact: true } }, '/admin': { - component: () => import('@xrengine/client-core/src/admin/adminRoutes') + component: () => import('@etherealengine/client-core/src/admin/adminRoutes') }, '/location': { - component: () => import('@xrengine/client/src/pages/location/location') + component: () => import('@etherealengine/client/src/pages/location/location') }, '/auth': { - component: () => import('@xrengine/client/src/pages/auth/authRoutes') + component: () => import('@etherealengine/client/src/pages/auth/authRoutes') }, '/editor': { - component: () => import('@xrengine/client/src/pages/editor/editor') + component: () => import('@etherealengine/client/src/pages/editor/editor') }, '/studio': { - component: () => import('@xrengine/client/src/pages/editor/editor') + component: () => import('@etherealengine/client/src/pages/editor/editor') }, '/room': { - component: () => import('@xrengine/client/src/pages/room') + component: () => import('@etherealengine/client/src/pages/room') } }, services: undefined, diff --git a/packages/projects/loadEngineInjection.ts b/packages/projects/loadEngineInjection.ts index 5e3e289bdb..ba9a0cd67b 100644 --- a/packages/projects/loadEngineInjection.ts +++ b/packages/projects/loadEngineInjection.ts @@ -1,4 +1,4 @@ -import type { World } from '@xrengine/engine/src/ecs/classes/World' +import type { World } from '@etherealengine/engine/src/ecs/classes/World' import { loadConfigForProject } from './loadConfigForProject' import type { ProjectConfigInterface } from './ProjectConfigInterface' diff --git a/packages/projects/loadSystemInjection.ts b/packages/projects/loadSystemInjection.ts index 0d3cf27efb..0aeb563e12 100644 --- a/packages/projects/loadSystemInjection.ts +++ b/packages/projects/loadSystemInjection.ts @@ -1,7 +1,7 @@ -import type { SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import { isClient } from '@xrengine/engine/src/common/functions/isClient' -import type { SystemModuleType } from '@xrengine/engine/src/ecs/functions/SystemFunctions' -import type { SystemComponentType } from '@xrengine/engine/src/scene/components/SystemComponent' +import type { SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import { isClient } from '@etherealengine/engine/src/common/functions/isClient' +import type { SystemModuleType } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' +import type { SystemComponentType } from '@etherealengine/engine/src/scene/components/SystemComponent' export const getSystemsFromSceneData = (project: string, sceneData: SceneJson): SystemModuleType[] => { const systems: SystemModuleType[] = [] diff --git a/packages/projects/makeSceneUUIDsUnique.ts b/packages/projects/makeSceneUUIDsUnique.ts index 33b75e851d..3c528468dd 100644 --- a/packages/projects/makeSceneUUIDsUnique.ts +++ b/packages/projects/makeSceneUUIDsUnique.ts @@ -3,8 +3,8 @@ import fs from 'fs' import path from 'path' import { v4 } from 'uuid' -import { EntityUUID } from '@xrengine/common/src/interfaces/EntityUUID' -import { SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' +import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID' +import { SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' for (const project of fs.readdirSync(path.resolve(appRootPath.path, 'packages/projects/projects/'))) { const files = fs.readdirSync(path.resolve(appRootPath.path, 'packages/projects/projects/', project)) diff --git a/packages/projects/package.json b/packages/projects/package.json index 11b0c12982..2339f67dc5 100644 --- a/packages/projects/package.json +++ b/packages/projects/package.json @@ -1,15 +1,14 @@ { - "name": "@xrengine/projects", + "name": "@etherealengine/projects", "version": "1.1.3", "main": "index.ts", "private": true, "description": "", "scripts": { - "update-name-gh-package": "node scripts/update-name-gh-package.js" }, "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "publishConfig": { "access": "public" @@ -17,7 +16,7 @@ "author": "", "license": "MIT", "bugs": { - "url": "https://github.com/XRFoundation/XREngine/issues" + "url": "https://github.com/etherealengine/etherealengine/issues" }, - "homepage": "https://github.com/XRFoundation/XREngine#readme" + "homepage": "https://github.com/etherealengine/etherealengine#readme" } diff --git a/packages/projects/scripts/update-name-gh-package.js b/packages/projects/scripts/update-name-gh-package.js deleted file mode 100644 index 752fb602e4..0000000000 --- a/packages/projects/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/projects'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/projects/template-project/.github/workflows/project-build.yml b/packages/projects/template-project/.github/workflows/project-build.yml index 824a6c9f67..00b1acb33a 100755 --- a/packages/projects/template-project/.github/workflows/project-build.yml +++ b/packages/projects/template-project/.github/workflows/project-build.yml @@ -18,10 +18,10 @@ jobs: if: ${{ needs.secrets-gate.outputs.ok == 'enabled' }} runs-on: ubuntu-latest steps: - - name: Checkout XREngine + - name: Checkout Ethereal Engine uses: actions/checkout@v3 with: - repository: xrfoundation/xrengine + repository: etherealengine/etherealengine - name: Checkout Project uses: actions/checkout@v3 with: diff --git a/packages/projects/template-project/LICENSE b/packages/projects/template-project/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/projects/template-project/LICENSE +++ b/packages/projects/template-project/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/projects/template-project/tests/setup.js b/packages/projects/template-project/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/projects/template-project/tests/setup.js +++ b/packages/projects/template-project/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/projects/template-project/xrengine.config.ts b/packages/projects/template-project/xrengine.config.ts index 9960d04467..00523578e5 100644 --- a/packages/projects/template-project/xrengine.config.ts +++ b/packages/projects/template-project/xrengine.config.ts @@ -1,4 +1,4 @@ -import type { ProjectConfigInterface } from '@xrengine/projects/ProjectConfigInterface' +import type { ProjectConfigInterface } from '@etherealengine/projects/ProjectConfigInterface' const config: ProjectConfigInterface = { onEvent: undefined, diff --git a/packages/server-core/.ctirc b/packages/server-core/.ctirc deleted file mode 100644 index d78b605933..0000000000 --- a/packages/server-core/.ctirc +++ /dev/null @@ -1,36 +0,0 @@ -{ - addNewline: true, - excludes: [ - '@types', - 'typings', - '__test__', - '__tests__', - 'node_modules', - ], - fileExcludePatterns: [], - fileFirst: true, - globOptions: { - cwd: 'D:\\Projects\\xr3ngine\\packages\\engine', - dot: true, - ignore: [ - '@types/**', - 'typings/**', - '__test__/**', - '__tests__/**', - 'node_modules/**', - ], - nonull: true, - }, - includeCWD: true, - output: 'index.ts', - quote: "'", - targetExts: [ - 'ts', - 'tsx', - ], - useSemicolon: false, - useTimestamp: false, - verbose: false, - withoutBackupFile: true, - withoutComment: true, -} diff --git a/packages/server-core/LICENSE b/packages/server-core/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/server-core/LICENSE +++ b/packages/server-core/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/server-core/declarations.ts b/packages/server-core/declarations.ts index 4b6bd3ecd7..7493773cb3 100755 --- a/packages/server-core/declarations.ts +++ b/packages/server-core/declarations.ts @@ -5,7 +5,7 @@ import '@feathersjs/transport-commons' import * as k8s from '@kubernetes/client-node' -import { ServiceTypes } from '@xrengine/common/declarations' +import { ServiceTypes } from '@etherealengine/common/declarations' import { SocketWebRTCServerNetwork } from '../instanceserver/src/SocketWebRTCServerNetwork' diff --git a/packages/server-core/package.json b/packages/server-core/package.json index 320a8afe48..b86fcfdbd5 100755 --- a/packages/server-core/package.json +++ b/packages/server-core/package.json @@ -1,10 +1,10 @@ { - "name": "@xrengine/server-core", - "description": "Shared components for XREngine server", + "name": "@etherealengine/server-core", + "description": "Shared components for Ethereal Engine server", "version": "1.1.3", "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "homepage": "", "publishConfig": { @@ -26,8 +26,8 @@ "vr" ], "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.org" }, "contributors": [], "bugs": {}, @@ -37,8 +37,7 @@ "scripts": { "check-errors": "tsc --noemit", "test": "mocha --jobs 1", - "validate": "npm run build && npm run test", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "validate": "npm run build && npm run test" }, "dependencies": { "@feathersjs/authentication": "5.0.0-pre.29", @@ -52,9 +51,9 @@ "@gltf-transform/extensions": "^2.4.1", "@gltf-transform/functions": "^2.4.1", "@kubernetes/client-node": "^0.16.2", - "@xrengine/common": "^1.1.3", - "@xrengine/engine": "^1.1.3", - "@xrengine/matchmaking": "^1.1.3", + "@etherealengine/common": "^1.1.3", + "@etherealengine/engine": "^1.1.3", + "@etherealengine/matchmaking": "^1.1.3", "app-root-path": "3.0.0", "aws-sdk": "2.1113.0", "bent": "^7.3.0", diff --git a/packages/server-core/scripts/update-name-gh-package.js b/packages/server-core/scripts/update-name-gh-package.js deleted file mode 100644 index 072808f1ee..0000000000 --- a/packages/server-core/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/server-core'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/server-core/src/analytics/analytics/analytics.class.ts b/packages/server-core/src/analytics/analytics/analytics.class.ts index 878c2908b1..0bb22f0e84 100755 --- a/packages/server-core/src/analytics/analytics/analytics.class.ts +++ b/packages/server-core/src/analytics/analytics/analytics.class.ts @@ -2,7 +2,7 @@ import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' -import { AdminAnalyticsResult } from '@xrengine/common/src/interfaces/AdminAnalyticsData' +import { AdminAnalyticsResult } from '@etherealengine/common/src/interfaces/AdminAnalyticsData' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/analytics/analytics/analytics.model.ts b/packages/server-core/src/analytics/analytics/analytics.model.ts index 789c19a1c7..9b7c58128e 100755 --- a/packages/server-core/src/analytics/analytics/analytics.model.ts +++ b/packages/server-core/src/analytics/analytics/analytics.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { AnalyticsInterface } from '@xrengine/common/src/dbmodels/Analytics' +import { AnalyticsInterface } from '@etherealengine/common/src/dbmodels/Analytics' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/analytics/analytics/analytics.service.ts b/packages/server-core/src/analytics/analytics/analytics.service.ts index cd10c0acea..1b218ac22d 100755 --- a/packages/server-core/src/analytics/analytics/analytics.service.ts +++ b/packages/server-core/src/analytics/analytics/analytics.service.ts @@ -6,7 +6,7 @@ import hooks from './analytics.hooks' import createModel from './analytics.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { analytics: Analytics } diff --git a/packages/server-core/src/analytics/seeder-config.ts b/packages/server-core/src/analytics/seeder-config.ts index d607ef9545..a4eb0bd4f7 100644 --- a/packages/server-core/src/analytics/seeder-config.ts +++ b/packages/server-core/src/analytics/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { analyticsSeedData } from './analytics/analytics.seed' diff --git a/packages/server-core/src/assets/assetLibrary/asset-library.class.ts b/packages/server-core/src/assets/assetLibrary/asset-library.class.ts index cbccec9f93..46ad9c1a85 100644 --- a/packages/server-core/src/assets/assetLibrary/asset-library.class.ts +++ b/packages/server-core/src/assets/assetLibrary/asset-library.class.ts @@ -4,7 +4,7 @@ import extract from 'extract-zip' import fs from 'fs' import path from 'path' -import { Application } from '@xrengine/server-core/declarations' +import { Application } from '@etherealengine/server-core/declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/assets/assetLibrary/asset-library.service.ts b/packages/server-core/src/assets/assetLibrary/asset-library.service.ts index 313b2f9b08..7e2c2630bf 100644 --- a/packages/server-core/src/assets/assetLibrary/asset-library.service.ts +++ b/packages/server-core/src/assets/assetLibrary/asset-library.service.ts @@ -2,7 +2,7 @@ import { Application } from '../../../declarations' import { AssetLibrary } from './asset-library.class' import hooks from './asset-library.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'asset-library': AssetLibrary } diff --git a/packages/server-core/src/assets/extensions/EE_MaterialTransformer.ts b/packages/server-core/src/assets/extensions/EE_MaterialTransformer.ts index 271544aa19..f45f564d4e 100644 --- a/packages/server-core/src/assets/extensions/EE_MaterialTransformer.ts +++ b/packages/server-core/src/assets/extensions/EE_MaterialTransformer.ts @@ -10,8 +10,8 @@ import { WriterContext } from '@gltf-transform/core' -import { prototypeFromId } from '@xrengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' -import { initializeMaterialLibrary } from '@xrengine/engine/src/renderer/materials/MaterialLibrary' +import { prototypeFromId } from '@etherealengine/engine/src/renderer/materials/functions/MaterialLibraryFunctions' +import { initializeMaterialLibrary } from '@etherealengine/engine/src/renderer/materials/MaterialLibrary' const EXTENSION_NAME = 'EE_material' diff --git a/packages/server-core/src/assets/ktx2-encode/ktx2-encode.service.ts b/packages/server-core/src/assets/ktx2-encode/ktx2-encode.service.ts index ad5b5fdbf3..6fc45f7fec 100644 --- a/packages/server-core/src/assets/ktx2-encode/ktx2-encode.service.ts +++ b/packages/server-core/src/assets/ktx2-encode/ktx2-encode.service.ts @@ -5,11 +5,11 @@ import path from 'path' import { MathUtils } from 'three' import util from 'util' -import { KTX2EncodeArguments } from '@xrengine/engine/src/assets/constants/CompressionParms' +import { KTX2EncodeArguments } from '@etherealengine/engine/src/assets/constants/CompressionParms' import { Application } from '../../../declarations' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'ktx2-encode': { create: (data: KTX2EncodeArguments) => Promise diff --git a/packages/server-core/src/assets/model-transform/model-transform.class.ts b/packages/server-core/src/assets/model-transform/model-transform.class.ts index 37da49525c..8f3900817e 100644 --- a/packages/server-core/src/assets/model-transform/model-transform.class.ts +++ b/packages/server-core/src/assets/model-transform/model-transform.class.ts @@ -2,8 +2,8 @@ import { Id, NullableId, Params, Query, ServiceMethods } from '@feathersjs/feath import appRootPath from 'app-root-path' import path from 'path' -import { ModelTransformParameters } from '@xrengine/engine/src/assets/classes/ModelTransform' -import { Application } from '@xrengine/server-core/declarations' +import { ModelTransformParameters } from '@etherealengine/engine/src/assets/classes/ModelTransform' +import { Application } from '@etherealengine/server-core/declarations' import { transformModel } from './model-transform.helpers' diff --git a/packages/server-core/src/assets/model-transform/model-transform.helpers.ts b/packages/server-core/src/assets/model-transform/model-transform.helpers.ts index db997a4cfe..8c6262f873 100644 --- a/packages/server-core/src/assets/model-transform/model-transform.helpers.ts +++ b/packages/server-core/src/assets/model-transform/model-transform.helpers.ts @@ -20,7 +20,7 @@ import sharp from 'sharp' import { MathUtils } from 'three' import util from 'util' -import { ModelTransformParameters } from '@xrengine/engine/src/assets/classes/ModelTransform' +import { ModelTransformParameters } from '@etherealengine/engine/src/assets/classes/ModelTransform' import { getContentType } from '../../util/fileUtils' import { EEMaterial } from '../extensions/EE_MaterialTransformer' diff --git a/packages/server-core/src/assets/model-transform/model-transform.service.ts b/packages/server-core/src/assets/model-transform/model-transform.service.ts index b6c632a5e0..65e42f735b 100644 --- a/packages/server-core/src/assets/model-transform/model-transform.service.ts +++ b/packages/server-core/src/assets/model-transform/model-transform.service.ts @@ -2,7 +2,7 @@ import { Application } from '../../../declarations' import { ModelTransform } from './model-transform.class' import hooks from './model-transform.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'model-transform': ModelTransform } diff --git a/packages/server-core/src/bot/bot-command/bot-command.class.ts b/packages/server-core/src/bot/bot-command/bot-command.class.ts index 6b6e7fb74b..974975e356 100644 --- a/packages/server-core/src/bot/bot-command/bot-command.class.ts +++ b/packages/server-core/src/bot/bot-command/bot-command.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { BotCommands as BotCommandInterface } from '@xrengine/common/src/interfaces/AdminBot' +import { BotCommands as BotCommandInterface } from '@etherealengine/common/src/interfaces/AdminBot' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/bot/bot-command/bot-command.model.ts b/packages/server-core/src/bot/bot-command/bot-command.model.ts index fd72548a9a..c7ff9c16b3 100644 --- a/packages/server-core/src/bot/bot-command/bot-command.model.ts +++ b/packages/server-core/src/bot/bot-command/bot-command.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { BotCommandInterface } from '@xrengine/common/src/dbmodels/BotCommand' +import { BotCommandInterface } from '@etherealengine/common/src/dbmodels/BotCommand' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/bot/bot-command/bot-command.service.ts b/packages/server-core/src/bot/bot-command/bot-command.service.ts index dcc45106e0..d9e28bc52e 100644 --- a/packages/server-core/src/bot/bot-command/bot-command.service.ts +++ b/packages/server-core/src/bot/bot-command/bot-command.service.ts @@ -4,7 +4,7 @@ import docs from './bot-command.docs' import hooks from './Bot-command.hooks' import createModel from './bot-command.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'bot-command': BotCommand } diff --git a/packages/server-core/src/bot/bot/bot.class.ts b/packages/server-core/src/bot/bot/bot.class.ts index 2ffe5dd987..511477c016 100644 --- a/packages/server-core/src/bot/bot/bot.class.ts +++ b/packages/server-core/src/bot/bot/bot.class.ts @@ -1,7 +1,7 @@ import { NullableId, Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { AdminBot, CreateBotAsAdmin } from '@xrengine/common/src/interfaces/AdminBot' +import { AdminBot, CreateBotAsAdmin } from '@etherealengine/common/src/interfaces/AdminBot' import { Application } from '../../../declarations' import { createBotCommands } from './bot.functions' diff --git a/packages/server-core/src/bot/bot/bot.functions.ts b/packages/server-core/src/bot/bot/bot.functions.ts index 1f58e675c0..0a8600dc42 100644 --- a/packages/server-core/src/bot/bot/bot.functions.ts +++ b/packages/server-core/src/bot/bot/bot.functions.ts @@ -1,4 +1,4 @@ -import { AdminBot, BotCommands } from '@xrengine/common/src/interfaces/AdminBot' +import { AdminBot, BotCommands } from '@etherealengine/common/src/interfaces/AdminBot' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/bot/bot/bot.model.ts b/packages/server-core/src/bot/bot/bot.model.ts index 4cc482006a..83e81a6596 100644 --- a/packages/server-core/src/bot/bot/bot.model.ts +++ b/packages/server-core/src/bot/bot/bot.model.ts @@ -15,7 +15,7 @@ export default (app: Application) => { }, name: { type: DataTypes.STRING, - defaultValue: (): string => 'xrengine bot' + Math.floor(Math.random() * (999 - 100 + 1) + 100), + defaultValue: (): string => 'etherealengine bot' + Math.floor(Math.random() * (999 - 100 + 1) + 100), allowNull: false }, description: { diff --git a/packages/server-core/src/bot/bot/bot.service.ts b/packages/server-core/src/bot/bot/bot.service.ts index ed1edd133e..a47c47b5a6 100644 --- a/packages/server-core/src/bot/bot/bot.service.ts +++ b/packages/server-core/src/bot/bot/bot.service.ts @@ -4,7 +4,7 @@ import docs from './bot.docs' import hooks from './bot.hooks' import createModel from './bot.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { bot: Bot } diff --git a/packages/server-core/src/bot/testbot/testbot-helper.ts b/packages/server-core/src/bot/testbot/testbot-helper.ts index 2b17afe469..34d9d6e27a 100644 --- a/packages/server-core/src/bot/testbot/testbot-helper.ts +++ b/packages/server-core/src/bot/testbot/testbot-helper.ts @@ -1,13 +1,13 @@ -import { SpawnTestBot, TestBot } from '@xrengine/common/src/interfaces/TestBot' -import config from '@xrengine/server-core/src/appconfig' -import serverLogger from '@xrengine/server-core/src/ServerLogger' +import { SpawnTestBot, TestBot } from '@etherealengine/common/src/interfaces/TestBot' +import config from '@etherealengine/server-core/src/appconfig' +import serverLogger from '@etherealengine/server-core/src/ServerLogger' import { Application } from '../../../declarations' export const getTestbotPod = async (app: Application) => { if (app.k8DefaultClient) { try { - const jobName = `${config.server.releaseName}-xrengine-testbot` + const jobName = `${config.server.releaseName}-etherealengine-testbot` const podsResult = await app.k8DefaultClient.listNamespacedPod('default') let pods: TestBot[] = [] for (const pod of podsResult.body.items) { @@ -37,7 +37,7 @@ export const getTestbotPod = async (app: Application) => { export const runTestbotJob = async (app: Application): Promise => { if (app.k8BatchClient) { try { - const jobName = `${config.server.releaseName}-xrengine-testbot` + const jobName = `${config.server.releaseName}-etherealengine-testbot` const oldJobResult = await app.k8BatchClient.readNamespacedJob(jobName, 'default') if (oldJobResult && oldJobResult.body) { diff --git a/packages/server-core/src/bot/testbot/testbot.service.ts b/packages/server-core/src/bot/testbot/testbot.service.ts index d16676003a..cd80ca1a6f 100644 --- a/packages/server-core/src/bot/testbot/testbot.service.ts +++ b/packages/server-core/src/bot/testbot/testbot.service.ts @@ -2,7 +2,7 @@ import { Application } from '../../../declarations' import { getTestbotPod, runTestbotJob } from './testbot-helper' import hooks from './testbot.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { testbot: any } diff --git a/packages/server-core/src/cluster/build-status/build-status.class.ts b/packages/server-core/src/cluster/build-status/build-status.class.ts index 0a71b3ba30..8298ccbf9c 100644 --- a/packages/server-core/src/cluster/build-status/build-status.class.ts +++ b/packages/server-core/src/cluster/build-status/build-status.class.ts @@ -1,7 +1,7 @@ import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { BuildStatus as BuildStatusInterface } from '@xrengine/common/src/interfaces/BuildStatus' +import { BuildStatus as BuildStatusInterface } from '@etherealengine/common/src/interfaces/BuildStatus' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/cluster/build-status/build-status.model.ts b/packages/server-core/src/cluster/build-status/build-status.model.ts index 3575c12996..7da24ced21 100755 --- a/packages/server-core/src/cluster/build-status/build-status.model.ts +++ b/packages/server-core/src/cluster/build-status/build-status.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { BuildStatusInterface } from '@xrengine/common/src/dbmodels/BuildStatus' +import { BuildStatusInterface } from '@etherealengine/common/src/dbmodels/BuildStatus' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/cluster/build-status/build-status.service.ts b/packages/server-core/src/cluster/build-status/build-status.service.ts index aa120953ce..2e4835ec60 100644 --- a/packages/server-core/src/cluster/build-status/build-status.service.ts +++ b/packages/server-core/src/cluster/build-status/build-status.service.ts @@ -3,7 +3,7 @@ import { BuildStatus } from './build-status.class' import hooks from './build-status.hooks' import createModel from './build-status.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'build-status': BuildStatus } diff --git a/packages/server-core/src/cluster/server-info/server-info-helper.ts b/packages/server-core/src/cluster/server-info/server-info-helper.ts index b74d612549..666b921771 100644 --- a/packages/server-core/src/cluster/server-info/server-info-helper.ts +++ b/packages/server-core/src/cluster/server-info/server-info-helper.ts @@ -1,9 +1,13 @@ import * as k8s from '@kubernetes/client-node' import { Op } from 'sequelize' -import { Channel } from '@xrengine/common/src/interfaces/Channel' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { ServerContainerInfo, ServerInfoInterface, ServerPodInfo } from '@xrengine/common/src/interfaces/ServerInfo' +import { Channel } from '@etherealengine/common/src/interfaces/Channel' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { + ServerContainerInfo, + ServerInfoInterface, + ServerPodInfo +} from '@etherealengine/common/src/interfaces/ServerInfo' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/cluster/server-info/server-info.class.ts b/packages/server-core/src/cluster/server-info/server-info.class.ts index 927af798b4..a3b8ec08c5 100644 --- a/packages/server-core/src/cluster/server-info/server-info.class.ts +++ b/packages/server-core/src/cluster/server-info/server-info.class.ts @@ -1,6 +1,6 @@ import { Params, ServiceMethods } from '@feathersjs/feathers' -import { ServerInfoInterface, ServerPodInfo } from '@xrengine/common/src/interfaces/ServerInfo' +import { ServerInfoInterface, ServerPodInfo } from '@etherealengine/common/src/interfaces/ServerInfo' import { Application } from '../../../declarations' import { getServerInfo, removePod } from './server-info-helper' diff --git a/packages/server-core/src/cluster/server-info/server-info.service.ts b/packages/server-core/src/cluster/server-info/server-info.service.ts index a0c977a3c4..d2fdc47ddd 100644 --- a/packages/server-core/src/cluster/server-info/server-info.service.ts +++ b/packages/server-core/src/cluster/server-info/server-info.service.ts @@ -2,7 +2,7 @@ import { Application } from '../../../declarations' import { ServerInfo } from './server-info.class' import hooks from './server-info.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'server-info': ServerInfo } diff --git a/packages/server-core/src/cluster/server-logs/server-logs.service.ts b/packages/server-core/src/cluster/server-logs/server-logs.service.ts index 1c4aef2494..bbee686a86 100644 --- a/packages/server-core/src/cluster/server-logs/server-logs.service.ts +++ b/packages/server-core/src/cluster/server-logs/server-logs.service.ts @@ -2,7 +2,7 @@ import { Application } from '../../../declarations' import { ServerLogs } from './server-logs.class' import hooks from './server-logs.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'server-logs': ServerLogs } diff --git a/packages/server-core/src/createApp.ts b/packages/server-core/src/createApp.ts index 228647b5f6..ee8957b6e6 100644 --- a/packages/server-core/src/createApp.ts +++ b/packages/server-core/src/createApp.ts @@ -11,10 +11,10 @@ import sync from 'feathers-sync' import helmet from 'helmet' import path from 'path' -import { isDev } from '@xrengine/common/src/config' -import { pipe } from '@xrengine/common/src/utils/pipe' -import { Engine } from '@xrengine/engine/src/ecs/classes/Engine' -import { createEngine, initializeNode, setupEngineActionSystems } from '@xrengine/engine/src/initializeEngine' +import { isDev } from '@etherealengine/common/src/config' +import { pipe } from '@etherealengine/common/src/utils/pipe' +import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' +import { createEngine, initializeNode, setupEngineActionSystems } from '@etherealengine/engine/src/initializeEngine' import { Application, ServerTypeMode } from '../declarations' import appConfig from './appconfig' @@ -37,8 +37,8 @@ export const configureOpenAPI = () => (app: Application) => { // TODO: Relate to server config, don't hardcode this here specs: { info: { - title: 'XREngine API Surface', - description: 'APIs for the XREngine application', + title: 'Ethereal Engine API Surface', + description: 'APIs for the Ethereal Engine application', version: '1.0.0' }, schemes: ['https'], diff --git a/packages/server-core/src/credential/verification-event/verification-event.class.ts b/packages/server-core/src/credential/verification-event/verification-event.class.ts index d23c6009ab..99d8a80762 100755 --- a/packages/server-core/src/credential/verification-event/verification-event.class.ts +++ b/packages/server-core/src/credential/verification-event/verification-event.class.ts @@ -1,7 +1,7 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import moment from 'moment' -import { VerificationEventInterface } from '@xrengine/common/src/dbmodels/VerificationEvent' +import { VerificationEventInterface } from '@etherealengine/common/src/dbmodels/VerificationEvent' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/credential/verification-event/verification-event.model.ts b/packages/server-core/src/credential/verification-event/verification-event.model.ts index 8ca363cf1b..1557bef451 100755 --- a/packages/server-core/src/credential/verification-event/verification-event.model.ts +++ b/packages/server-core/src/credential/verification-event/verification-event.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { VerificationEventInterface } from '@xrengine/common/src/dbmodels/VerificationEvent' +import { VerificationEventInterface } from '@etherealengine/common/src/dbmodels/VerificationEvent' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/credential/verification-event/verification-event.service.ts b/packages/server-core/src/credential/verification-event/verification-event.service.ts index aff44ec44f..0aaa71754e 100755 --- a/packages/server-core/src/credential/verification-event/verification-event.service.ts +++ b/packages/server-core/src/credential/verification-event/verification-event.service.ts @@ -6,7 +6,7 @@ import hooks from './verification-event.hooks' import createModel from './verification-event.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'verification-event': VerificationEvent } diff --git a/packages/server-core/src/hooks/add-associations.ts b/packages/server-core/src/hooks/add-associations.ts index b35925067c..a8f748a8ed 100755 --- a/packages/server-core/src/hooks/add-associations.ts +++ b/packages/server-core/src/hooks/add-associations.ts @@ -1,6 +1,6 @@ import { Hook, HookContext } from '@feathersjs/feathers' -import { Application } from '@xrengine/server-core/declarations' +import { Application } from '@etherealengine/server-core/declarations' import logger from '../ServerLogger' diff --git a/packages/server-core/src/hooks/channel-permission-authenticate.ts b/packages/server-core/src/hooks/channel-permission-authenticate.ts index b4bd39a1bf..90969b03aa 100755 --- a/packages/server-core/src/hooks/channel-permission-authenticate.ts +++ b/packages/server-core/src/hooks/channel-permission-authenticate.ts @@ -1,7 +1,7 @@ import { BadRequest, Forbidden } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from './../../declarations' diff --git a/packages/server-core/src/hooks/create-group-owner.ts b/packages/server-core/src/hooks/create-group-owner.ts index c73adca698..43f37f9449 100755 --- a/packages/server-core/src/hooks/create-group-owner.ts +++ b/packages/server-core/src/hooks/create-group-owner.ts @@ -1,6 +1,6 @@ import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' // This will attach the owner ID in the contact while creating/updating list item export default () => { diff --git a/packages/server-core/src/hooks/createPartyInstance.ts b/packages/server-core/src/hooks/createPartyInstance.ts index 67b5bcc0bb..d02eee464f 100644 --- a/packages/server-core/src/hooks/createPartyInstance.ts +++ b/packages/server-core/src/hooks/createPartyInstance.ts @@ -1,8 +1,8 @@ import { HookContext } from '@feathersjs/feathers' import _ from 'lodash' -import { Channel } from '@xrengine/common/src/interfaces/Channel' -import { Instance } from '@xrengine/common/src/interfaces/Instance' +import { Channel } from '@etherealengine/common/src/interfaces/Channel' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' import config from '../appconfig' import getLocalServerIp, { ServerAddress } from '../util/get-local-server-ip' diff --git a/packages/server-core/src/hooks/group-permission-authenticate.ts b/packages/server-core/src/hooks/group-permission-authenticate.ts index cbe51d68a5..59abbf8484 100755 --- a/packages/server-core/src/hooks/group-permission-authenticate.ts +++ b/packages/server-core/src/hooks/group-permission-authenticate.ts @@ -1,7 +1,7 @@ import { BadRequest, Forbidden } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' // This will attach the owner ID in the contact while creating/updating list item export default () => { diff --git a/packages/server-core/src/hooks/group-user-permission-authenticate.ts b/packages/server-core/src/hooks/group-user-permission-authenticate.ts index 96b3090a20..a4b3cce995 100755 --- a/packages/server-core/src/hooks/group-user-permission-authenticate.ts +++ b/packages/server-core/src/hooks/group-user-permission-authenticate.ts @@ -2,7 +2,7 @@ import { BadRequest } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' import _ from 'lodash' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' // This will attach the owner ID in the contact while creating/updating list item export default () => { diff --git a/packages/server-core/src/hooks/invite-remove-authenticate.ts b/packages/server-core/src/hooks/invite-remove-authenticate.ts index 9c3b0d44c7..0fc079b24c 100755 --- a/packages/server-core/src/hooks/invite-remove-authenticate.ts +++ b/packages/server-core/src/hooks/invite-remove-authenticate.ts @@ -1,8 +1,8 @@ import { BadRequest } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import Paginated from '../types/PageObject' diff --git a/packages/server-core/src/hooks/matchmaking-create-instance.ts b/packages/server-core/src/hooks/matchmaking-create-instance.ts index 01627dfb7c..05af78afa8 100644 --- a/packages/server-core/src/hooks/matchmaking-create-instance.ts +++ b/packages/server-core/src/hooks/matchmaking-create-instance.ts @@ -1,7 +1,7 @@ import { Hook, HookContext, Paginated } from '@feathersjs/feathers' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { Location as LocationType } from '@xrengine/common/src/interfaces/Location' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { Location as LocationType } from '@etherealengine/common/src/interfaces/Location' import { Application } from '../../declarations' import { getFreeInstanceserver } from '../networking/instance-provision/instance-provision.class' diff --git a/packages/server-core/src/hooks/matchmaking-link-match-user-to-match.ts b/packages/server-core/src/hooks/matchmaking-link-match-user-to-match.ts index 165ed40787..4464e3490e 100644 --- a/packages/server-core/src/hooks/matchmaking-link-match-user-to-match.ts +++ b/packages/server-core/src/hooks/matchmaking-link-match-user-to-match.ts @@ -1,6 +1,6 @@ import { Hook, HookContext } from '@feathersjs/feathers' -import { OpenMatchTicketAssignment } from '@xrengine/matchmaking/src/interfaces' +import { OpenMatchTicketAssignment } from '@etherealengine/matchmaking/src/interfaces' import logger from '../ServerLogger' diff --git a/packages/server-core/src/hooks/matchmaking-restrict-multiple-queueing.ts b/packages/server-core/src/hooks/matchmaking-restrict-multiple-queueing.ts index ec47c14195..6492f62d8d 100644 --- a/packages/server-core/src/hooks/matchmaking-restrict-multiple-queueing.ts +++ b/packages/server-core/src/hooks/matchmaking-restrict-multiple-queueing.ts @@ -1,7 +1,7 @@ import { BadRequest } from '@feathersjs/errors' import { Hook, HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' /** * prevent user to join new search game more then once at time diff --git a/packages/server-core/src/hooks/matchmaking-save-ticket.ts b/packages/server-core/src/hooks/matchmaking-save-ticket.ts index 6271adfa61..68ed6a644a 100644 --- a/packages/server-core/src/hooks/matchmaking-save-ticket.ts +++ b/packages/server-core/src/hooks/matchmaking-save-ticket.ts @@ -1,6 +1,6 @@ import { Hook, HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' export default (): Hook => { return async (context: HookContext): Promise => { diff --git a/packages/server-core/src/hooks/message-permission-authenticate.ts b/packages/server-core/src/hooks/message-permission-authenticate.ts index 016a05212a..aaa5052a36 100755 --- a/packages/server-core/src/hooks/message-permission-authenticate.ts +++ b/packages/server-core/src/hooks/message-permission-authenticate.ts @@ -1,7 +1,7 @@ import { BadRequest } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from './../../declarations' diff --git a/packages/server-core/src/hooks/project-permission-authenticate.ts b/packages/server-core/src/hooks/project-permission-authenticate.ts index 13c77d4e47..46764b2511 100755 --- a/packages/server-core/src/hooks/project-permission-authenticate.ts +++ b/packages/server-core/src/hooks/project-permission-authenticate.ts @@ -1,8 +1,8 @@ import { BadRequest, Forbidden } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' -import { GITHUB_URL_REGEX } from '@xrengine/common/src/constants/GitHubConstants' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { GITHUB_URL_REGEX } from '@etherealengine/common/src/constants/GitHubConstants' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { checkUserRepoWriteStatus } from '../projects/project/github-helper' diff --git a/packages/server-core/src/hooks/send-invite.ts b/packages/server-core/src/hooks/send-invite.ts index b4ed5d81a7..cdff59db24 100755 --- a/packages/server-core/src/hooks/send-invite.ts +++ b/packages/server-core/src/hooks/send-invite.ts @@ -3,9 +3,9 @@ import appRootPath from 'app-root-path' import * as path from 'path' import * as pug from 'pug' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' -import { Invite as InviteType } from '@xrengine/common/src/interfaces/Invite' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' +import { Invite as InviteType } from '@etherealengine/common/src/interfaces/Invite' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../declarations' import config from '../appconfig' diff --git a/packages/server-core/src/hooks/set-loggedin-user-in-body.ts b/packages/server-core/src/hooks/set-loggedin-user-in-body.ts index a0bd0a30b8..01d5169710 100755 --- a/packages/server-core/src/hooks/set-loggedin-user-in-body.ts +++ b/packages/server-core/src/hooks/set-loggedin-user-in-body.ts @@ -1,6 +1,6 @@ import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' // This will attach the owner ID in the contact while creating/updating list item export default (propertyName: string) => { diff --git a/packages/server-core/src/hooks/set-loggedin-user-in-query.ts b/packages/server-core/src/hooks/set-loggedin-user-in-query.ts index f95354ee36..2c8e07e3da 100755 --- a/packages/server-core/src/hooks/set-loggedin-user-in-query.ts +++ b/packages/server-core/src/hooks/set-loggedin-user-in-query.ts @@ -1,6 +1,6 @@ import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' // TODO: Make one hook by combine this with "set-loggedin-user-in-body" // This will attach the loggedIn user id in the query property diff --git a/packages/server-core/src/hooks/validatePresignedRequest.ts b/packages/server-core/src/hooks/validatePresignedRequest.ts index 33c5c2ba75..31622b9c8e 100755 --- a/packages/server-core/src/hooks/validatePresignedRequest.ts +++ b/packages/server-core/src/hooks/validatePresignedRequest.ts @@ -6,7 +6,7 @@ import { MAX_THUMBNAIL_FILE_SIZE, MIN_AVATAR_FILE_SIZE, MIN_THUMBNAIL_FILE_SIZE -} from '@xrengine/common/src/constants/AvatarConstants' +} from '@etherealengine/common/src/constants/AvatarConstants' export const validateGet = async (context: HookContext): Promise => { const q = context.params.query! diff --git a/packages/server-core/src/hooks/verify-location-admin.ts b/packages/server-core/src/hooks/verify-location-admin.ts index 8c13951a4b..4fe0c513b7 100644 --- a/packages/server-core/src/hooks/verify-location-admin.ts +++ b/packages/server-core/src/hooks/verify-location-admin.ts @@ -1,8 +1,8 @@ import { Forbidden } from '@feathersjs/errors' import { HookContext, Paginated } from '@feathersjs/feathers' -import { LocationAdmin } from '@xrengine/common/src/interfaces/LocationAdmin' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { LocationAdmin } from '@etherealengine/common/src/interfaces/LocationAdmin' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../declarations' diff --git a/packages/server-core/src/hooks/verify-project-owner.ts b/packages/server-core/src/hooks/verify-project-owner.ts index 3e6e4f09dc..e4d4fa929e 100644 --- a/packages/server-core/src/hooks/verify-project-owner.ts +++ b/packages/server-core/src/hooks/verify-project-owner.ts @@ -1,7 +1,7 @@ import { BadRequest, Forbidden } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../declarations' import { UnauthenticatedException } from '../util/exceptions/exception' diff --git a/packages/server-core/src/hooks/verify-scope.test.ts b/packages/server-core/src/hooks/verify-scope.test.ts index 3154b36315..f9c35932fe 100755 --- a/packages/server-core/src/hooks/verify-scope.test.ts +++ b/packages/server-core/src/hooks/verify-scope.test.ts @@ -1,7 +1,7 @@ import { HookContext } from '@feathersjs/feathers/lib' import assert from 'assert' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../declarations' import { createFeathersExpressApp } from '../createApp' diff --git a/packages/server-core/src/hooks/verify-scope.ts b/packages/server-core/src/hooks/verify-scope.ts index 0e219ef9ec..2cca9527cf 100644 --- a/packages/server-core/src/hooks/verify-scope.ts +++ b/packages/server-core/src/hooks/verify-scope.ts @@ -1,6 +1,6 @@ import { HookContext } from '@feathersjs/feathers' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../declarations' import { NotFoundException, UnauthenticatedException, UnauthorizedException } from '../util/exceptions/exception' diff --git a/packages/server-core/src/matchmaking/emulate.ts b/packages/server-core/src/matchmaking/emulate.ts index abd8a0fc05..941b3a123d 100644 --- a/packages/server-core/src/matchmaking/emulate.ts +++ b/packages/server-core/src/matchmaking/emulate.ts @@ -1,4 +1,4 @@ -import { OpenMatchTicket, OpenMatchTicketAssignment } from '@xrengine/matchmaking/src/interfaces' +import { OpenMatchTicket, OpenMatchTicketAssignment } from '@etherealengine/matchmaking/src/interfaces' async function waitAndGetMatchUser(app, ticketId, userId, timeout) { return new Promise((resolve, reject) => { diff --git a/packages/server-core/src/matchmaking/match-instance/match-instance.class.ts b/packages/server-core/src/matchmaking/match-instance/match-instance.class.ts index 71623d2309..740c32d18f 100755 --- a/packages/server-core/src/matchmaking/match-instance/match-instance.class.ts +++ b/packages/server-core/src/matchmaking/match-instance/match-instance.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { MatchInstanceInterface } from '@xrengine/common/src/dbmodels/MatchInstance' +import { MatchInstanceInterface } from '@etherealengine/common/src/dbmodels/MatchInstance' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/matchmaking/match-instance/match-instance.hooks.ts b/packages/server-core/src/matchmaking/match-instance/match-instance.hooks.ts index c8709b037b..de8157f6e2 100755 --- a/packages/server-core/src/matchmaking/match-instance/match-instance.hooks.ts +++ b/packages/server-core/src/matchmaking/match-instance/match-instance.hooks.ts @@ -1,6 +1,6 @@ import { disallow, iff, isProvider } from 'feathers-hooks-common' -import setLoggedInUser from '@xrengine/server-core/src/hooks/set-loggedin-user-in-body' +import setLoggedInUser from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-body' import authenticate from '../../hooks/authenticate' import createInstance from '../../hooks/matchmaking-create-instance' diff --git a/packages/server-core/src/matchmaking/match-instance/match-instance.model.ts b/packages/server-core/src/matchmaking/match-instance/match-instance.model.ts index 4afd88db8a..a51708bbbb 100755 --- a/packages/server-core/src/matchmaking/match-instance/match-instance.model.ts +++ b/packages/server-core/src/matchmaking/match-instance/match-instance.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { MatchInstanceInterface } from '@xrengine/common/src/dbmodels/MatchInstance' +import { MatchInstanceInterface } from '@etherealengine/common/src/dbmodels/MatchInstance' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/matchmaking/match-instance/match-instance.service.ts b/packages/server-core/src/matchmaking/match-instance/match-instance.service.ts index 8602ff937c..f6e1ff5e99 100755 --- a/packages/server-core/src/matchmaking/match-instance/match-instance.service.ts +++ b/packages/server-core/src/matchmaking/match-instance/match-instance.service.ts @@ -4,7 +4,7 @@ import matchTicketDocs from './match-instance.docs' import hooks from './match-instance.hooks' import createModel from './match-instance.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'match-instance': MatchInstance } diff --git a/packages/server-core/src/matchmaking/match-instance/match-instance.test.ts b/packages/server-core/src/matchmaking/match-instance/match-instance.test.ts index 43be7db24f..7b9eec7ee6 100644 --- a/packages/server-core/src/matchmaking/match-instance/match-instance.test.ts +++ b/packages/server-core/src/matchmaking/match-instance/match-instance.test.ts @@ -1,8 +1,8 @@ import assert from 'assert' import nock from 'nock' -import { FRONTEND_SERVICE_URL } from '@xrengine/matchmaking/src/functions' -import type { OpenMatchTicket } from '@xrengine/matchmaking/src/interfaces' +import { FRONTEND_SERVICE_URL } from '@etherealengine/matchmaking/src/functions' +import type { OpenMatchTicket } from '@etherealengine/matchmaking/src/interfaces' import { Application } from '../../../declarations' import { createFeathersExpressApp } from '../../createApp' diff --git a/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.class.ts b/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.class.ts index abc669f082..d562b3f615 100755 --- a/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.class.ts +++ b/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.class.ts @@ -1,8 +1,8 @@ import { BadRequest, NotFound } from '@feathersjs/errors' import { Id, NullableId, Params, ServiceMethods } from '@feathersjs/feathers' -import { getTicketsAssignment } from '@xrengine/matchmaking/src/functions' -import { OpenMatchTicketAssignment } from '@xrengine/matchmaking/src/interfaces' +import { getTicketsAssignment } from '@etherealengine/matchmaking/src/functions' +import { OpenMatchTicketAssignment } from '@etherealengine/matchmaking/src/interfaces' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.hooks.ts b/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.hooks.ts index 8cd0beb8cb..6b6f96e40d 100755 --- a/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.hooks.ts +++ b/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.hooks.ts @@ -1,6 +1,6 @@ import { disallow } from 'feathers-hooks-common' -import linkMatchUserToMatch from '@xrengine/server-core/src/hooks/matchmaking-link-match-user-to-match' +import linkMatchUserToMatch from '@etherealengine/server-core/src/hooks/matchmaking-link-match-user-to-match' // Don't remove this comment. It's needed to format import lines nicely. diff --git a/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.service.ts b/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.service.ts index b7afb35b31..5066e9520d 100755 --- a/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.service.ts +++ b/packages/server-core/src/matchmaking/match-ticket-assignment/match-ticket-assignment.service.ts @@ -3,7 +3,7 @@ import { MatchTicketAssignment } from './match-ticket-assignment.class' import docs from './match-ticket-assignment.docs' import hooks from './match-ticket-assignment.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'match-ticket-assignment': MatchTicketAssignment } diff --git a/packages/server-core/src/matchmaking/match-ticket/match-ticket.class.ts b/packages/server-core/src/matchmaking/match-ticket/match-ticket.class.ts index c4ec8e222f..617884962d 100755 --- a/packages/server-core/src/matchmaking/match-ticket/match-ticket.class.ts +++ b/packages/server-core/src/matchmaking/match-ticket/match-ticket.class.ts @@ -1,9 +1,9 @@ import { BadRequest, NotFound } from '@feathersjs/errors' import { Id, NullableId, Params, ServiceMethods } from '@feathersjs/feathers' -import { createTicket, deleteTicket, getTicket } from '@xrengine/matchmaking/src/functions' -import { OpenMatchTicket } from '@xrengine/matchmaking/src/interfaces' -import config from '@xrengine/server-core/src/appconfig' +import { createTicket, deleteTicket, getTicket } from '@etherealengine/matchmaking/src/functions' +import { OpenMatchTicket } from '@etherealengine/matchmaking/src/interfaces' +import config from '@etherealengine/server-core/src/appconfig' import { Application } from '../../../declarations' import { emulate_createTicket, emulate_getTicket } from '../emulate' diff --git a/packages/server-core/src/matchmaking/match-ticket/match-ticket.hooks.ts b/packages/server-core/src/matchmaking/match-ticket/match-ticket.hooks.ts index bc6f93cfd6..31af7acbb1 100755 --- a/packages/server-core/src/matchmaking/match-ticket/match-ticket.hooks.ts +++ b/packages/server-core/src/matchmaking/match-ticket/match-ticket.hooks.ts @@ -1,9 +1,9 @@ import { disallow, iff, isProvider } from 'feathers-hooks-common' -import matchmakingRemoveTicket from '@xrengine/server-core/src/hooks/matchmaking-remove-ticket' -import matchmakingRestrictMultipleQueueing from '@xrengine/server-core/src/hooks/matchmaking-restrict-multiple-queueing' -import matchmakingSaveTicket from '@xrengine/server-core/src/hooks/matchmaking-save-ticket' -import setLoggedInUser from '@xrengine/server-core/src/hooks/set-loggedin-user-in-body' +import matchmakingRemoveTicket from '@etherealengine/server-core/src/hooks/matchmaking-remove-ticket' +import matchmakingRestrictMultipleQueueing from '@etherealengine/server-core/src/hooks/matchmaking-restrict-multiple-queueing' +import matchmakingSaveTicket from '@etherealengine/server-core/src/hooks/matchmaking-save-ticket' +import setLoggedInUser from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-body' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/matchmaking/match-ticket/match-ticket.service.ts b/packages/server-core/src/matchmaking/match-ticket/match-ticket.service.ts index 42fb796621..e25b62a794 100755 --- a/packages/server-core/src/matchmaking/match-ticket/match-ticket.service.ts +++ b/packages/server-core/src/matchmaking/match-ticket/match-ticket.service.ts @@ -3,7 +3,7 @@ import { MatchTicket } from './match-ticket.class' import matchTicketDocs from './match-ticket.docs' import hooks from './match-ticket.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'match-ticket': MatchTicket } diff --git a/packages/server-core/src/matchmaking/match-user/match-user.class.ts b/packages/server-core/src/matchmaking/match-user/match-user.class.ts index 2df9abb340..7030db7287 100755 --- a/packages/server-core/src/matchmaking/match-user/match-user.class.ts +++ b/packages/server-core/src/matchmaking/match-user/match-user.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { MatchUserInterface } from '@xrengine/common/src/dbmodels/MatchUser' +import { MatchUserInterface } from '@etherealengine/common/src/dbmodels/MatchUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/matchmaking/match-user/match-user.hooks.ts b/packages/server-core/src/matchmaking/match-user/match-user.hooks.ts index b3e5879d3b..fddeac4ed3 100755 --- a/packages/server-core/src/matchmaking/match-user/match-user.hooks.ts +++ b/packages/server-core/src/matchmaking/match-user/match-user.hooks.ts @@ -1,7 +1,7 @@ import { iff, isProvider } from 'feathers-hooks-common' -import setLoggedInUser from '@xrengine/server-core/src/hooks/set-loggedin-user-in-body' -import setLoggedInUserInQuery from '@xrengine/server-core/src/hooks/set-loggedin-user-in-query' +import setLoggedInUser from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-body' +import setLoggedInUserInQuery from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-query' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/matchmaking/match-user/match-user.model.ts b/packages/server-core/src/matchmaking/match-user/match-user.model.ts index fa445780ae..fb4cadbded 100755 --- a/packages/server-core/src/matchmaking/match-user/match-user.model.ts +++ b/packages/server-core/src/matchmaking/match-user/match-user.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { MatchUserInterface } from '@xrengine/common/src/dbmodels/MatchUser' +import { MatchUserInterface } from '@etherealengine/common/src/dbmodels/MatchUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/matchmaking/match-user/match-user.service.ts b/packages/server-core/src/matchmaking/match-user/match-user.service.ts index b9ddcc05c3..5eebed8207 100755 --- a/packages/server-core/src/matchmaking/match-user/match-user.service.ts +++ b/packages/server-core/src/matchmaking/match-user/match-user.service.ts @@ -4,7 +4,7 @@ import matchUserDocs from './match-user.docs' import hooks from './match-user.hooks' import createModel from './match-user.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'match-user': MatchUser } diff --git a/packages/server-core/src/media/file-browser/file-browser.class.ts b/packages/server-core/src/media/file-browser/file-browser.class.ts index ecbdcc2329..d110d4f7e8 100755 --- a/packages/server-core/src/media/file-browser/file-browser.class.ts +++ b/packages/server-core/src/media/file-browser/file-browser.class.ts @@ -4,9 +4,9 @@ import appRootPath from 'app-root-path' import fs from 'fs' import path from 'path/posix' -import { FileContentType } from '@xrengine/common/src/interfaces/FileContentType' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' -import { processFileName } from '@xrengine/common/src/utils/processFileName' +import { FileContentType } from '@etherealengine/common/src/interfaces/FileContentType' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' +import { processFileName } from '@etherealengine/common/src/utils/processFileName' import { Application } from '../../../declarations' import { UserParams } from '../../user/user/user.class' diff --git a/packages/server-core/src/media/file-browser/file-browser.service.ts b/packages/server-core/src/media/file-browser/file-browser.service.ts index 4249521ef2..f94fcdc7b3 100755 --- a/packages/server-core/src/media/file-browser/file-browser.service.ts +++ b/packages/server-core/src/media/file-browser/file-browser.service.ts @@ -6,7 +6,7 @@ import { UploadParams } from '../upload-asset/upload-asset.service' import { FileBrowserService } from './file-browser.class' import hooks from './file-browser.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'file-browser': FileBrowserService 'file-browser/upload': { diff --git a/packages/server-core/src/media/file-browser/file-browser.test.ts b/packages/server-core/src/media/file-browser/file-browser.test.ts index 231ced9c9c..c81d94af55 100644 --- a/packages/server-core/src/media/file-browser/file-browser.test.ts +++ b/packages/server-core/src/media/file-browser/file-browser.test.ts @@ -3,7 +3,7 @@ import assert from 'assert' import fs from 'fs' import path from 'path/posix' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' import { Application } from '../../../declarations' import { createFeathersExpressApp } from '../../createApp' diff --git a/packages/server-core/src/media/oembed/oembed.hooks.ts b/packages/server-core/src/media/oembed/oembed.hooks.ts index 57c24befaa..6490f9b174 100755 --- a/packages/server-core/src/media/oembed/oembed.hooks.ts +++ b/packages/server-core/src/media/oembed/oembed.hooks.ts @@ -1,6 +1,6 @@ import { disallow } from 'feathers-hooks-common' -import logRequest from '@xrengine/server-core/src/hooks/log-request' +import logRequest from '@etherealengine/server-core/src/hooks/log-request' // Don't remove this comment. It's needed to format import lines nicely. diff --git a/packages/server-core/src/media/oembed/oembed.service.ts b/packages/server-core/src/media/oembed/oembed.service.ts index 6fc0518a05..cba6f39020 100755 --- a/packages/server-core/src/media/oembed/oembed.service.ts +++ b/packages/server-core/src/media/oembed/oembed.service.ts @@ -2,15 +2,15 @@ import { BadRequest } from '@feathersjs/errors' import { Params } from '@feathersjs/feathers' import { Paginated } from '@feathersjs/feathers/lib' -import { ClientSetting } from '@xrengine/common/src/interfaces/ClientSetting' -import { OEmbed } from '@xrengine/common/src/interfaces/OEmbed' -import { ServerSetting } from '@xrengine/common/src/interfaces/ServerSetting' +import { ClientSetting } from '@etherealengine/common/src/interfaces/ClientSetting' +import { OEmbed } from '@etherealengine/common/src/interfaces/OEmbed' +import { ServerSetting } from '@etherealengine/common/src/interfaces/ServerSetting' import { Application } from '../../../declarations' import { getProjectConfig, onProjectEvent } from '../../projects/project/project-helper' import hooks from './oembed.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { oembed: any } diff --git a/packages/server-core/src/media/seeder-config.ts b/packages/server-core/src/media/seeder-config.ts index aaf840b7aa..29f2ff5ff6 100755 --- a/packages/server-core/src/media/seeder-config.ts +++ b/packages/server-core/src/media/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { staticResourceTypeSeed } from './static-resource-type/static-resource-type.seed' diff --git a/packages/server-core/src/media/static-resource-type/static-resource-type.class.ts b/packages/server-core/src/media/static-resource-type/static-resource-type.class.ts index 67cc73edcc..3ad062f1c0 100755 --- a/packages/server-core/src/media/static-resource-type/static-resource-type.class.ts +++ b/packages/server-core/src/media/static-resource-type/static-resource-type.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { StaticResourceTypeInterface } from '@xrengine/common/src/dbmodels/StaticResourceType' +import { StaticResourceTypeInterface } from '@etherealengine/common/src/dbmodels/StaticResourceType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/media/static-resource-type/static-resource-type.model.ts b/packages/server-core/src/media/static-resource-type/static-resource-type.model.ts index a8a9d25211..80bdf35cd3 100755 --- a/packages/server-core/src/media/static-resource-type/static-resource-type.model.ts +++ b/packages/server-core/src/media/static-resource-type/static-resource-type.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { StaticResourceTypeInterface } from '@xrengine/common/src/dbmodels/StaticResourceType' +import { StaticResourceTypeInterface } from '@etherealengine/common/src/dbmodels/StaticResourceType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/media/static-resource-type/static-resource-type.service.ts b/packages/server-core/src/media/static-resource-type/static-resource-type.service.ts index 6766d907da..7a42baee74 100755 --- a/packages/server-core/src/media/static-resource-type/static-resource-type.service.ts +++ b/packages/server-core/src/media/static-resource-type/static-resource-type.service.ts @@ -4,7 +4,7 @@ import staticResourceTypeDocs from './static-resource-type.docs' import hooks from './static-resource-type.hooks' import createModel from './static-resource-type.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'static-resource-type': StaticResourceType } diff --git a/packages/server-core/src/media/static-resource/static-resource.class.ts b/packages/server-core/src/media/static-resource/static-resource.class.ts index d2547f9dbe..c2533583fa 100755 --- a/packages/server-core/src/media/static-resource/static-resource.class.ts +++ b/packages/server-core/src/media/static-resource/static-resource.class.ts @@ -2,7 +2,7 @@ import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' import { Application } from '../../../declarations' import verifyScope from '../../hooks/verify-scope' diff --git a/packages/server-core/src/media/static-resource/static-resource.hooks.ts b/packages/server-core/src/media/static-resource/static-resource.hooks.ts index 2a0c3c5f3c..72629dc078 100755 --- a/packages/server-core/src/media/static-resource/static-resource.hooks.ts +++ b/packages/server-core/src/media/static-resource/static-resource.hooks.ts @@ -1,8 +1,8 @@ import { disallow, iff, isProvider } from 'feathers-hooks-common' -import collectAnalytics from '@xrengine/server-core/src/hooks/collect-analytics' -import replaceThumbnailLink from '@xrengine/server-core/src/hooks/replace-thumbnail-link' -import attachOwnerIdInQuery from '@xrengine/server-core/src/hooks/set-loggedin-user-in-query' +import collectAnalytics from '@etherealengine/server-core/src/hooks/collect-analytics' +import replaceThumbnailLink from '@etherealengine/server-core/src/hooks/replace-thumbnail-link' +import attachOwnerIdInQuery from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-query' import authenticate from '../../hooks/authenticate' import verifyScope from '../../hooks/verify-scope' diff --git a/packages/server-core/src/media/static-resource/static-resource.model.ts b/packages/server-core/src/media/static-resource/static-resource.model.ts index 2bdaa09782..79ca692a81 100755 --- a/packages/server-core/src/media/static-resource/static-resource.model.ts +++ b/packages/server-core/src/media/static-resource/static-resource.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { StaticResourceInterface } from '@xrengine/common/src/dbmodels/StaticResource' +import { StaticResourceInterface } from '@etherealengine/common/src/dbmodels/StaticResource' import { Application } from '../../../declarations' import generateShortId from '../../util/generate-short-id' diff --git a/packages/server-core/src/media/static-resource/static-resource.service.ts b/packages/server-core/src/media/static-resource/static-resource.service.ts index cbce740fe9..32576b78ac 100755 --- a/packages/server-core/src/media/static-resource/static-resource.service.ts +++ b/packages/server-core/src/media/static-resource/static-resource.service.ts @@ -1,4 +1,4 @@ -import { StaticResourceInterface } from '@xrengine/common/src/dbmodels/StaticResource' +import { StaticResourceInterface } from '@etherealengine/common/src/dbmodels/StaticResource' import { Application } from '../../../declarations' import authenticate from '../../hooks/authenticate' @@ -8,7 +8,7 @@ import staticResourceDocs from './static-resource.docs' import hooks from './static-resource.hooks' import createModel from './static-resource.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'static-resource': StaticResource 'static-resource-filters': any diff --git a/packages/server-core/src/media/storageprovider/ipfs.storage.ts b/packages/server-core/src/media/storageprovider/ipfs.storage.ts index d92b76da6f..827dc5ac52 100755 --- a/packages/server-core/src/media/storageprovider/ipfs.storage.ts +++ b/packages/server-core/src/media/storageprovider/ipfs.storage.ts @@ -5,7 +5,7 @@ import path from 'path' import * as stream from 'stream' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' -import { FileContentType } from '@xrengine/common/src/interfaces/FileContentType' +import { FileContentType } from '@etherealengine/common/src/interfaces/FileContentType' import config from '../../appconfig' import { diff --git a/packages/server-core/src/media/storageprovider/local.storage.ts b/packages/server-core/src/media/storageprovider/local.storage.ts index aea7df4d6b..a09040296e 100755 --- a/packages/server-core/src/media/storageprovider/local.storage.ts +++ b/packages/server-core/src/media/storageprovider/local.storage.ts @@ -4,7 +4,7 @@ import fsStore from 'fs-blob-store' import glob from 'glob' import path from 'path/posix' -import { FileContentType } from '@xrengine/common/src/interfaces/FileContentType' +import { FileContentType } from '@etherealengine/common/src/interfaces/FileContentType' import config from '../../appconfig' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/media/storageprovider/s3.storage.ts b/packages/server-core/src/media/storageprovider/s3.storage.ts index e78ddf04aa..0d0deda963 100755 --- a/packages/server-core/src/media/storageprovider/s3.storage.ts +++ b/packages/server-core/src/media/storageprovider/s3.storage.ts @@ -4,7 +4,7 @@ import fetch from 'node-fetch' import path from 'path/posix' import S3BlobStore from 's3-blob-store' -import { FileContentType } from '@xrengine/common/src/interfaces/FileContentType' +import { FileContentType } from '@etherealengine/common/src/interfaces/FileContentType' import config from '../../appconfig' import { getCachedURL } from './getCachedURL' diff --git a/packages/server-core/src/media/storageprovider/storageprovider.interface.ts b/packages/server-core/src/media/storageprovider/storageprovider.interface.ts index ece3ec35ba..313aa143e3 100755 --- a/packages/server-core/src/media/storageprovider/storageprovider.interface.ts +++ b/packages/server-core/src/media/storageprovider/storageprovider.interface.ts @@ -1,4 +1,4 @@ -import { FileContentType } from '@xrengine/common/src/interfaces/FileContentType' +import { FileContentType } from '@etherealengine/common/src/interfaces/FileContentType' /** * Put object parameters interface for adding to storage. diff --git a/packages/server-core/src/media/upload-asset/upload-asset.hooks.ts b/packages/server-core/src/media/upload-asset/upload-asset.hooks.ts index 0e71941fe9..475c995be0 100755 --- a/packages/server-core/src/media/upload-asset/upload-asset.hooks.ts +++ b/packages/server-core/src/media/upload-asset/upload-asset.hooks.ts @@ -1,8 +1,8 @@ import { disallow } from 'feathers-hooks-common' import { SYNC } from 'feathers-sync' -import logRequest from '@xrengine/server-core/src/hooks/log-request' -import setLoggedInUser from '@xrengine/server-core/src/hooks/set-loggedin-user-in-body' +import logRequest from '@etherealengine/server-core/src/hooks/log-request' +import setLoggedInUser from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-body' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/media/upload-asset/upload-asset.service.ts b/packages/server-core/src/media/upload-asset/upload-asset.service.ts index 3d66e2e515..a1a8024891 100755 --- a/packages/server-core/src/media/upload-asset/upload-asset.service.ts +++ b/packages/server-core/src/media/upload-asset/upload-asset.service.ts @@ -4,13 +4,13 @@ import multer from 'multer' import { Op } from 'sequelize' import { MathUtils } from 'three' -import { StaticResourceInterface } from '@xrengine/common/src/interfaces/StaticResourceInterface' +import { StaticResourceInterface } from '@etherealengine/common/src/interfaces/StaticResourceInterface' import { AdminAssetUploadArgumentsType, AssetUploadType, UploadFile -} from '@xrengine/common/src/interfaces/UploadAssetInterface' -import { processFileName } from '@xrengine/common/src/utils/processFileName' +} from '@etherealengine/common/src/interfaces/UploadAssetInterface' +import { processFileName } from '@etherealengine/common/src/utils/processFileName' import { Application } from '../../../declarations' import verifyScope from '../../hooks/verify-scope' @@ -22,7 +22,7 @@ import hooks from './upload-asset.hooks' const multipartMiddleware = multer({ limits: { fieldSize: Infinity } }) -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'upload-asset': any } diff --git a/packages/server-core/src/networking/instance-attendance/instance-attendance.class.ts b/packages/server-core/src/networking/instance-attendance/instance-attendance.class.ts index f854c516df..e8203fd60e 100755 --- a/packages/server-core/src/networking/instance-attendance/instance-attendance.class.ts +++ b/packages/server-core/src/networking/instance-attendance/instance-attendance.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { InstanceAttendanceInterface } from '@xrengine/common/src/dbmodels/InstanceAttendance' +import { InstanceAttendanceInterface } from '@etherealengine/common/src/dbmodels/InstanceAttendance' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instance-attendance/instance-attendance.model.ts b/packages/server-core/src/networking/instance-attendance/instance-attendance.model.ts index e24cef41bd..581497a1a5 100755 --- a/packages/server-core/src/networking/instance-attendance/instance-attendance.model.ts +++ b/packages/server-core/src/networking/instance-attendance/instance-attendance.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { InstanceAttendanceInterface } from '@xrengine/common/src/dbmodels/InstanceAttendance' +import { InstanceAttendanceInterface } from '@etherealengine/common/src/dbmodels/InstanceAttendance' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instance-attendance/instance-attendance.service.ts b/packages/server-core/src/networking/instance-attendance/instance-attendance.service.ts index ae6adb12dc..bf0579c604 100755 --- a/packages/server-core/src/networking/instance-attendance/instance-attendance.service.ts +++ b/packages/server-core/src/networking/instance-attendance/instance-attendance.service.ts @@ -4,7 +4,7 @@ import instanceAttendanceDocs from './instance-attendance.docs' import hooks from './instance-attendance.hooks' import createModel from './instance-attendance.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'instance-attendance': InstanceAttendance } diff --git a/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.class.ts b/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.class.ts index 7fb12696db..121fe786d5 100755 --- a/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.class.ts +++ b/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { InstanceAuthorizedUser as InstanceAuthorizedUserInterface } from '@xrengine/common/src/interfaces/InstanceAuthorizedUser' +import { InstanceAuthorizedUser as InstanceAuthorizedUserInterface } from '@etherealengine/common/src/interfaces/InstanceAuthorizedUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.model.ts b/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.model.ts index 1d50a5ab55..47b495e4c3 100755 --- a/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.model.ts +++ b/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { InstanceAuthorizedUserInterface } from '@xrengine/common/src/dbmodels/InstanceAuthorizedUser' +import { InstanceAuthorizedUserInterface } from '@etherealengine/common/src/dbmodels/InstanceAuthorizedUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.service.ts b/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.service.ts index adbcc20ed6..1d4c3157e0 100755 --- a/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.service.ts +++ b/packages/server-core/src/networking/instance-authorized-user/instance-authorized-user.service.ts @@ -6,7 +6,7 @@ import hooks from './instance-authorized-user.hooks' import createModel from './instance-authorized-user.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'instance-authorized-user': InstanceAuthorizedUser } diff --git a/packages/server-core/src/networking/instance-provision/instance-provision.class.ts b/packages/server-core/src/networking/instance-provision/instance-provision.class.ts index f441e38483..3d958afcf8 100755 --- a/packages/server-core/src/networking/instance-provision/instance-provision.class.ts +++ b/packages/server-core/src/networking/instance-provision/instance-provision.class.ts @@ -5,8 +5,8 @@ import _ from 'lodash' import fetch from 'node-fetch' import Sequelize, { Op } from 'sequelize' -import { Instance } from '@xrengine/common/src/interfaces/Instance' -import { InstanceServerProvisionResult } from '@xrengine/common/src/interfaces/InstanceServerProvisionResult' +import { Instance } from '@etherealengine/common/src/interfaces/Instance' +import { InstanceServerProvisionResult } from '@etherealengine/common/src/interfaces/InstanceServerProvisionResult' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/networking/instance-provision/instance-provision.service.ts b/packages/server-core/src/networking/instance-provision/instance-provision.service.ts index e881a382ed..a7d51b83d7 100755 --- a/packages/server-core/src/networking/instance-provision/instance-provision.service.ts +++ b/packages/server-core/src/networking/instance-provision/instance-provision.service.ts @@ -6,7 +6,7 @@ import instanceProvisionDocs from './instance-provision.docs' import hooks from './instance-provision.hooks' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'instance-provision': InstanceProvision } diff --git a/packages/server-core/src/networking/instance/instance.class.ts b/packages/server-core/src/networking/instance/instance.class.ts index 4efbe8dc2e..800e73b58a 100755 --- a/packages/server-core/src/networking/instance/instance.class.ts +++ b/packages/server-core/src/networking/instance/instance.class.ts @@ -2,7 +2,7 @@ import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import Sequelize, { Op } from 'sequelize' -import { Instance as InstanceInterface } from '@xrengine/common/src/interfaces/Instance' +import { Instance as InstanceInterface } from '@etherealengine/common/src/interfaces/Instance' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instance/instance.hooks.ts b/packages/server-core/src/networking/instance/instance.hooks.ts index 9917acb317..7e01c234fe 100755 --- a/packages/server-core/src/networking/instance/instance.hooks.ts +++ b/packages/server-core/src/networking/instance/instance.hooks.ts @@ -1,6 +1,6 @@ import { iff, isProvider } from 'feathers-hooks-common' -import addAssociations from '@xrengine/server-core/src/hooks/add-associations' +import addAssociations from '@etherealengine/server-core/src/hooks/add-associations' import authenticate from '../../hooks/authenticate' import verifyScope from '../../hooks/verify-scope' diff --git a/packages/server-core/src/networking/instance/instance.model.ts b/packages/server-core/src/networking/instance/instance.model.ts index 053b4bd9cb..76ea347861 100755 --- a/packages/server-core/src/networking/instance/instance.model.ts +++ b/packages/server-core/src/networking/instance/instance.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { InstanceInterface } from '@xrengine/common/src/dbmodels/Instance' +import { InstanceInterface } from '@etherealengine/common/src/dbmodels/Instance' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instance/instance.service.ts b/packages/server-core/src/networking/instance/instance.service.ts index c4599674a9..9ef09147e4 100755 --- a/packages/server-core/src/networking/instance/instance.service.ts +++ b/packages/server-core/src/networking/instance/instance.service.ts @@ -1,7 +1,7 @@ import { Params } from '@feathersjs/feathers/lib' -import { LocationInterface } from '@xrengine/common/src/dbmodels/Location' -import { Instance as InstanceInterface } from '@xrengine/common/src/interfaces/Instance' +import { LocationInterface } from '@etherealengine/common/src/dbmodels/Location' +import { Instance as InstanceInterface } from '@etherealengine/common/src/interfaces/Instance' import { Application } from '../../../declarations' import authenticate from '../../hooks/authenticate' @@ -12,7 +12,7 @@ import instanceDocs from './instance.docs' import hooks from './instance.hooks' import createModel from './instance.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { instance: Instance 'instances-active': { diff --git a/packages/server-core/src/networking/instanceserver-load/instanceserver-load.service.ts b/packages/server-core/src/networking/instanceserver-load/instanceserver-load.service.ts index 2ebf9eae2b..ea47967249 100644 --- a/packages/server-core/src/networking/instanceserver-load/instanceserver-load.service.ts +++ b/packages/server-core/src/networking/instanceserver-load/instanceserver-load.service.ts @@ -1,7 +1,7 @@ import { Application } from '../../../declarations' import hooks from './instanceserver-load.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'instanceserver-load': any } diff --git a/packages/server-core/src/networking/instanceserver-provision/instanceserver-provision.service.ts b/packages/server-core/src/networking/instanceserver-provision/instanceserver-provision.service.ts index 1c923b68cc..ef1acbd6e8 100644 --- a/packages/server-core/src/networking/instanceserver-provision/instanceserver-provision.service.ts +++ b/packages/server-core/src/networking/instanceserver-provision/instanceserver-provision.service.ts @@ -2,7 +2,7 @@ import { Application } from '../../../declarations' import { patchInstanceserverLocation } from './instanceserver-provision-helper' import hooks from './instanceserver-provision.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'instanceserver-provision': { patch: ReturnType diff --git a/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.class.ts b/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.class.ts index 19e19196e2..6d8b9c7216 100755 --- a/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.class.ts +++ b/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { InstanceserverSubdomainProvisionInterface } from '@xrengine/common/src/dbmodels/InstanceserverSubdomainProvision' +import { InstanceserverSubdomainProvisionInterface } from '@etherealengine/common/src/dbmodels/InstanceserverSubdomainProvision' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.model.ts b/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.model.ts index dc7e6337a3..b19baf68ef 100755 --- a/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.model.ts +++ b/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.model.ts @@ -3,7 +3,7 @@ import { DataTypes, Model, Sequelize } from 'sequelize' import { HookReturn } from 'sequelize/types/hooks' -import { InstanceserverSubdomainProvisionInterface } from '@xrengine/common/src/dbmodels/InstanceserverSubdomainProvision' +import { InstanceserverSubdomainProvisionInterface } from '@etherealengine/common/src/dbmodels/InstanceserverSubdomainProvision' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.service.ts b/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.service.ts index bd790a3f78..39cb16c211 100755 --- a/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.service.ts +++ b/packages/server-core/src/networking/instanceserver-subdomain-provision/instanceserver-subdomain-provision.service.ts @@ -6,7 +6,7 @@ import hooks from './instanceserver-subdomain-provision.hooks' import createModel from './instanceserver-subdomain-provision.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'instanceserver-subdomain-provision': InstanceserverSubdomainProvision } diff --git a/packages/server-core/src/networking/seeder-config.ts b/packages/server-core/src/networking/seeder-config.ts index de7b45d335..a0f10fc389 100755 --- a/packages/server-core/src/networking/seeder-config.ts +++ b/packages/server-core/src/networking/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' export const networkingSeeds: Array = [] diff --git a/packages/server-core/src/payments/seat-status/seat-status.class.ts b/packages/server-core/src/payments/seat-status/seat-status.class.ts deleted file mode 100755 index e1773b34a8..0000000000 --- a/packages/server-core/src/payments/seat-status/seat-status.class.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SequelizeServiceOptions, Service } from 'feathers-sequelize' - -import { SeatStatus as SeatStatusInterface } from '@xrengine/common/src/interfaces/SeatStatus' - -import { Application } from '../../../declarations' - -export type SeatStatusDataType = SeatStatusInterface -/** - * A class for Seat Status service - */ -export class SeatStatus extends Service { - public docs: any - constructor(options: Partial, app: Application) { - super(options) - } -} diff --git a/packages/server-core/src/payments/seat-status/seat-status.docs.ts b/packages/server-core/src/payments/seat-status/seat-status.docs.ts deleted file mode 100755 index 9ce000410d..0000000000 --- a/packages/server-core/src/payments/seat-status/seat-status.docs.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * An object for swagger documentation configuration - */ -export default { - definitions: { - 'seat-status': { - type: 'object', - properties: { - status: { - type: 'string' - } - } - }, - 'seat-status_list': { - type: 'array', - items: { $ref: '#/definitions/seat-status' } - } - } -} diff --git a/packages/server-core/src/payments/seat-status/seat-status.hooks.ts b/packages/server-core/src/payments/seat-status/seat-status.hooks.ts deleted file mode 100755 index a507d59e43..0000000000 --- a/packages/server-core/src/payments/seat-status/seat-status.hooks.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { disallow } from 'feathers-hooks-common' - -export default { - before: { - all: [], - find: [], - get: [], - create: [disallow('external')], - update: [disallow()], - patch: [disallow()], - remove: [disallow('external')] - }, - - after: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - }, - - error: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - } -} as any diff --git a/packages/server-core/src/payments/seat-status/seat-status.model.ts b/packages/server-core/src/payments/seat-status/seat-status.model.ts deleted file mode 100755 index b9ed33d72a..0000000000 --- a/packages/server-core/src/payments/seat-status/seat-status.model.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { DataTypes, Model, Sequelize } from 'sequelize' - -import { SeatStatusInterface } from '@xrengine/common/src/dbmodels/SeatStatus' - -import { Application } from '../../../declarations' - -export default (app: Application) => { - const sequelizeClient: Sequelize = app.get('sequelizeClient') - const seatStatus = sequelizeClient.define>( - 'seat_status', - { - status: { - type: DataTypes.STRING, - allowNull: false, - primaryKey: true, - unique: true - } - }, - { - hooks: { - beforeCount(options: any): void { - options.raw = true - } - }, - timestamps: false - } - ) - - ;(seatStatus as any).associate = (models: any): void => { - ;(seatStatus as any).hasMany(models.seat, { foreignKey: 'seatStatus' }) - } - - return seatStatus -} diff --git a/packages/server-core/src/payments/seat-status/seat-status.seed.ts b/packages/server-core/src/payments/seat-status/seat-status.seed.ts deleted file mode 100755 index 384558b18b..0000000000 --- a/packages/server-core/src/payments/seat-status/seat-status.seed.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const seed = { - path: 'seat-status', - templates: [{ status: 'pending' }, { status: 'filled' }] -} - -export default seed diff --git a/packages/server-core/src/payments/seat-status/seat-status.service.ts b/packages/server-core/src/payments/seat-status/seat-status.service.ts deleted file mode 100755 index cac76ab825..0000000000 --- a/packages/server-core/src/payments/seat-status/seat-status.service.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Application } from '../../../declarations' -import { SeatStatus } from './seat-status.class' -import seatStatusDocs from './seat-status.docs' -import hooks from './seat-status.hooks' -import createModel from './seat-status.model' - -declare module '@xrengine/common/declarations' { - interface ServiceTypes { - 'seat-status': SeatStatus - } -} - -export default (app: Application) => { - const options = { - Model: createModel(app), - paginate: app.get('paginate'), - multi: true - } - /** - * Initialize our service with any options it requires and docs - */ - const event = new SeatStatus(options, app) - event.docs = seatStatusDocs - app.use('seat-status', event) - - /** - * Get our initialized service so that we can register hooks - */ - const service = app.service('seat-status') - - service.hooks(hooks) -} diff --git a/packages/server-core/src/payments/seat/seat.class.ts b/packages/server-core/src/payments/seat/seat.class.ts deleted file mode 100755 index ea6f6c2985..0000000000 --- a/packages/server-core/src/payments/seat/seat.class.ts +++ /dev/null @@ -1,174 +0,0 @@ -import { BadRequest, NotFound } from '@feathersjs/errors' -import { Params } from '@feathersjs/feathers' -import { SequelizeServiceOptions, Service } from 'feathers-sequelize' - -import { Seat as SeatInterface } from '@xrengine/common/src/interfaces/Seat' - -import { Application } from '../../../declarations' -import logger from '../../ServerLogger' - -interface SeatParams extends Params { - self: boolean - userId?: string -} - -export type SeatDataType = SeatInterface - -/** - * A class for Seat service - */ -export class Seat extends Service { - app: Application - docs: any - constructor(options: Partial, app: Application) { - super(options) - this.app = app - } - - async create(data: any, params?: SeatParams): Promise { - const userId = (params as any).userId || (params as any).connection['identity-provider'].userId - if (userId == undefined) { - throw new Error('Invalid user') - } - const subscription = await this.app.service('subscription').find({ - query: { - status: true, - userId: userId - } - }) - - if ((subscription as any).total === 0) { - throw new BadRequest('Not signed up for a subscription') - } - const { totalSeats, unusedSeats, filledSeats, pendingSeats } = (subscription as any).data[0] - - if (unusedSeats === 0 || (filledSeats as number) + (pendingSeats as number) === totalSeats) { - throw new BadRequest('All available seats filled or pending') - } - - if (params?.self === true) { - const existingSelfSeat = await super.find({ - query: { - subscriptionId: data.subscriptionId, - userId: userId - } - }) - if ((existingSelfSeat as any).total > 0) { - await Promise.all( - (existingSelfSeat as any).data.map((seat: any) => { - return super.remove(seat.id) - }) - ) - } - const createSet: any = { - subscriptionId: data.subscriptionId, - userId: userId, - seatStatus: 'filled' - } - const seat = await super.create({ ...createSet }) - - await this.app.service('subscription').patch(data.subscriptionId, { - unusedSeats: (unusedSeats as number) - 1, - filledSeats: (filledSeats as number) + 1 - }) - return seat as T - } else { - const identityProvider = await this.app.service('identity-provider').find({ - query: { - type: 'email', - token: data.email - } - }) - const existingUserInSeat = - (identityProvider as any).total > 0 - ? await this.app.service('seat').find({ - query: { - userId: (identityProvider as any).data[0].userId - } - }) - : { total: 0 } - if ((existingUserInSeat as any).total > 0) { - throw new BadRequest('User already has a seat') - } - - const link = await this.app.service('magic-link').create( - { - type: 'email', - email: data.email, - subscriptionId: data.subscriptionId - }, - null! - ) - const newIdentityProvider = await this.app.service('identity-provider').find({ - query: { - type: (link as any).type, - token: (link as any).email - } - }) - if ((newIdentityProvider as any).total === 0) { - throw new BadRequest('Invalid email address') - } - const createSet: any = { - subscriptionId: data.subscriptionId, - userId: (newIdentityProvider as any).data[0].userId, - seatStatus: 'pending' - } - const seat = await super.create({ ...createSet }) - - await this.app.service('subscription').patch(data.subscriptionId, { - unusedSeats: (unusedSeats as number) - 1, - pendingSeats: (pendingSeats as number) + 1 - }) - return seat as T - } - } - - async patch(id: string, data: any): Promise { - const subscriptionId = data.subscriptionId as string - const subscription = await this.app.service('subscription').get(subscriptionId) - if (subscription == null) { - logger.info( - 'Attempt to patch subscription ' + subscriptionId + ' failed because that is not a valid subscription' - ) - throw new NotFound() - } - const seatResult = await super.find({ - query: { - userId: id - } - }) - if ((seatResult as any).total === 0) { - logger.info( - 'Attempt to patch user ' + - id + - ' into subscription ' + - subscriptionId + - ' failed because that user does not have a seat there.' - ) - throw new NotFound() - } - - if ((seatResult as any).total > 1) { - logger.info('User has too many seats somehow') - throw new BadRequest('User has too many seats') - } - - const seat = (seatResult as any).data[0] - if (seat.subscriptionId !== subscriptionId) { - throw new BadRequest('User does not have a seat on that subscription') - } - if (seat.seatStatus === 'pending') { - const patchSet: any = { - seatStatus: 'filled' - } - await super.patch(seat.id, { ...patchSet }) - - await this.app.service('subscription').patch(subscription.id, { - pendingSeats: (subscription.pendingSeats as number) - 1, - filledSeats: (subscription.pendingSeats as number) + 1 - }) - } - - return seat - } -} diff --git a/packages/server-core/src/payments/seat/seat.docs.ts b/packages/server-core/src/payments/seat/seat.docs.ts deleted file mode 100755 index 4e96e93e7e..0000000000 --- a/packages/server-core/src/payments/seat/seat.docs.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * An object for swagger documentation configuration - */ -export default { - definitions: { - seat: { - type: 'object', - properties: {} - }, - seat_list: { - type: 'array', - items: { $ref: '#/definitions/seat' } - } - }, - securities: ['create', 'update', 'patch', 'remove'], - operations: { - find: { - security: [{ bearer: [] }] - } - } -} diff --git a/packages/server-core/src/payments/seat/seat.hooks.ts b/packages/server-core/src/payments/seat/seat.hooks.ts deleted file mode 100755 index 39dcbb05b4..0000000000 --- a/packages/server-core/src/payments/seat/seat.hooks.ts +++ /dev/null @@ -1,119 +0,0 @@ -import { BadRequest, NotFound } from '@feathersjs/errors' -import { HookContext } from '@feathersjs/feathers' -import { disallow, iff, isProvider } from 'feathers-hooks-common' - -import authenticate from '../../hooks/authenticate' - -// Don't remove this comment. It's needed to format import lines nicely. - -export default { - before: { - all: [authenticate()], - find: [ - iff(isProvider('external'), (async (context: HookContext): Promise => { - const { app, params } = context - - const ownedSubscription = await app.service('subscription').find({ - query: { - userId: params['identity-provider']?.userId || (params as any).query.connection['identity-provider'].userId - } - }) - if (ownedSubscription.total === 0) { - throw new BadRequest('NO SUBSCRIPTION') - } - ;(params as any).query.subscriptionId = ownedSubscription.data[0].id - return context - }) as any) - ], - get: [], - create: [], - update: [disallow()], - patch: [], - remove: [ - async (context: HookContext): Promise => { - const { app, id, params } = context - - const ownedSubscription = await app.service('subscription').find({ - query: { - userId: params['identity-provider']?.userId || (params as any).query.connection['identity-provider'].userId - } - }) - if (ownedSubscription.total === 0) { - throw new BadRequest('NO SUBSCRIPTION') - } - const seatResult = await app.service('seat').get(id!) - if (seatResult == null) { - throw new NotFound() - } - if (seatResult.subscriptionId !== ownedSubscription.data[0].id) { - throw new NotFound() - } - params.removedSeat = seatResult - params.ownedSubscription = ownedSubscription.data[0] - return context - } - ] - }, - - after: { - all: [], - find: [ - async (context: HookContext): Promise => { - const { app, result } = context - await Promise.all( - result.data.map(async (seat: any) => { - const user = await app.service('user').get(seat.userId) - const identityProviderResult = await app.service('identity-provider').find({ - query: { - type: 'email', - userId: seat.userId - } - }) - if (user != null) { - seat.user = { - name: user.name - } - } - if (identityProviderResult.total > 0) { - seat.user = { - ...seat.user, - email: identityProviderResult.data[0].token - } - } - }) - ) - return context - } - ], - get: [], - create: [], - update: [], - patch: [], - remove: [ - async (context: HookContext): Promise => { - const { app, params } = context - const ownedSubscription = (params as any).ownedSubscription - const update = { - unusedSeats: (ownedSubscription.unusedSeats as number) + 1 - } - if ((params as any).removedSeat.seatStatus === 'pending') { - ;(update as any).pendingSeats = ownedSubscription.pendingSeats - 1 - } else if ((params as any).removedSeat.seatStatus === 'filled') { - ;(update as any).filledSeats = ownedSubscription.filledSeats - 1 - } - await app.service('subscription').patch(ownedSubscription.id, update) - return context - } - ] - }, - - error: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - } -} as any diff --git a/packages/server-core/src/payments/seat/seat.model.ts b/packages/server-core/src/payments/seat/seat.model.ts deleted file mode 100755 index 5f9cbd8f49..0000000000 --- a/packages/server-core/src/payments/seat/seat.model.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Model, Sequelize } from 'sequelize' - -import { SeatInterface } from '@xrengine/common/src/dbmodels/Seat' - -import { Application } from '../../../declarations' - -export default (app: Application) => { - const sequelizeClient: Sequelize = app.get('sequelizeClient') - const seat = sequelizeClient.define>( - 'seat', - {}, - { - hooks: { - beforeCount(options: any): void { - options.raw = true - } - } - } - ) - - ;(seat as any).associate = (models: any): void => { - ;(seat as any).belongsTo(models.subscription, { foreignKey: { name: 'subscriptionId', allowNull: false } }) - ;(seat as any).belongsTo(models.user, { foreignKey: { name: 'userId', allowNull: false } }) - ;(seat as any).belongsTo(models.seat_status, { foreignKey: { name: 'seatStatus', allowNull: false } }) - } - - return seat -} diff --git a/packages/server-core/src/payments/seat/seat.service.ts b/packages/server-core/src/payments/seat/seat.service.ts deleted file mode 100755 index 7d685d22db..0000000000 --- a/packages/server-core/src/payments/seat/seat.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Application } from '../../../declarations' -import { Seat } from './seat.class' -import seatDocs from './seat.docs' -import hooks from './seat.hooks' -import createModel from './seat.model' - -// Add this service to the service type index -declare module '@xrengine/common/declarations' { - interface ServiceTypes { - seat: Seat - } -} - -export default (app: Application) => { - const options = { - Model: createModel(app), - paginate: app.get('paginate'), - multi: true - } - - /** - * Initialize our service with any options it requires and docs - */ - const event = new Seat(options, app) - event.docs = seatDocs - app.use('seat', event) - - /** - * Get our initialized service so that we can register hooks - */ - const service = app.service('seat') - - service.hooks(hooks) -} diff --git a/packages/server-core/src/payments/seeder-config.ts b/packages/server-core/src/payments/seeder-config.ts deleted file mode 100755 index de90b9da79..0000000000 --- a/packages/server-core/src/payments/seeder-config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' - -export const paymentSeeds: Array = [] - -export default paymentSeeds diff --git a/packages/server-core/src/payments/services.ts b/packages/server-core/src/payments/services.ts deleted file mode 100755 index a41e22d886..0000000000 --- a/packages/server-core/src/payments/services.ts +++ /dev/null @@ -1,5 +0,0 @@ -import SeatStatus from './seat-status/seat-status.service' -import SubscriptionLevel from './subscription-level/subscription-level.service' -import SubscriptionType from './subscription-type/subscription-type.service' - -export default [SeatStatus, SubscriptionLevel, SubscriptionType] diff --git a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.class.ts b/packages/server-core/src/payments/subscription-confirm/subscription-confirm.class.ts deleted file mode 100755 index 68b87d92c8..0000000000 --- a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.class.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { BadRequest } from '@feathersjs/errors' -import { Id, NullableId, Params, ServiceMethods } from '@feathersjs/feathers' -import chargebee from 'chargebee' - -import { Application } from '../../../declarations' -import logger from '../../ServerLogger' -import Paginated from '../../types/PageObject' - -interface Data {} - -interface ServiceOptions {} - -/** - * A class for Subcription Confirm service - */ -export class SubscriptionConfirm implements ServiceMethods { - app: Application - options: ServiceOptions - docs: any - - constructor(options: ServiceOptions = {}, app: Application) { - this.options = options - this.app = app - } - - async setup() {} - - async find(params?: Params): Promise> { - return [] - } - - async get(id: Id, params?: Params): Promise { - let chargebeeSubscription - const userId = (params as any).query.customer_id - - try { - chargebeeSubscription = await chargebee.subscription.retrieve(id).request() - } catch (err) { - throw new BadRequest('Invalid Subscription ID') - } - - if (chargebeeSubscription.customer.id !== userId) { - throw new BadRequest('Mismatched Customer ID') - } - - const subscriptionResult = await this.app.service('subscription').find({ - query: { - id: id, - userId: userId, - status: 0 - } - }) - if ((subscriptionResult as any).total > 0) { - const subscription = (subscriptionResult as any).data[0] - const subscriptionType = await this.app.service('subscription-type').get(subscription.plan) - await this.app.service('subscription').patch(id, { - status: true, - totalSeats: subscriptionType.seats, - filledSeats: 0, - unusedSeats: subscriptionType.seats, - pendingSeats: 0 - }) - - try { - await this.app.service('seat').create( - { - subscriptionId: subscription.id - }, - { - self: true, - userId: userId - } - ) - return await Promise.resolve({}) - } catch (err) { - logger.error(err) - } - } else { - throw new BadRequest('Invalid subscription information') - } - return null! - } - - async create(data: Data, params?: Params): Promise { - if (Array.isArray(data)) { - return await Promise.all(data.map((current) => this.create(current, params))) - } - - return data - } - - async update(id: NullableId, data: Data, params?: Params): Promise { - return data - } - - async patch(id: NullableId, data: Data, params?: Params): Promise { - return data - } - - async remove(id: NullableId, params?: Params): Promise { - return { id } - } -} diff --git a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.docs.ts b/packages/server-core/src/payments/subscription-confirm/subscription-confirm.docs.ts deleted file mode 100755 index 6318fdc57c..0000000000 --- a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.docs.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * An object for swagger documentation configuration - */ -export default { - definitions: { - 'subscription-confirm': { - type: 'object', - properties: {} - }, - 'subscription-confirm_list': { - type: 'array', - items: { $ref: '#/definitions/subscription-confirm' } - } - } -} diff --git a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.hooks.ts b/packages/server-core/src/payments/subscription-confirm/subscription-confirm.hooks.ts deleted file mode 100755 index b995bf243d..0000000000 --- a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.hooks.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { disallow } from 'feathers-hooks-common' - -// Don't remove this comment. It's needed to format import lines nicely. - -export default { - before: { - all: [], - find: [disallow()], - get: [], - create: [disallow()], - update: [disallow()], - patch: [disallow()], - remove: [disallow()] - }, - - after: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - }, - - error: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - } -} as any diff --git a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.service.ts b/packages/server-core/src/payments/subscription-confirm/subscription-confirm.service.ts deleted file mode 100755 index ca48b28f27..0000000000 --- a/packages/server-core/src/payments/subscription-confirm/subscription-confirm.service.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Application } from '../../../declarations' -import config from '../../appconfig' -import { SubscriptionConfirm } from './subscription-confirm.class' -import subscriptionConfirmDocs from './subscription-confirm.docs' -import hooks from './subscription-confirm.hooks' - -// Add this service to the service type index -declare module '@xrengine/common/declarations' { - interface ServiceTypes { - 'subscription-confirm': SubscriptionConfirm - } -} - -export default (app: Application) => { - const options = { - paginate: app.get('paginate') - } - - /** - * Initialize our service with any options it requires and docs - */ - const event = new SubscriptionConfirm(options, app) - event.docs = subscriptionConfirmDocs - - app.use('subscription-confirm', event, (req, res) => { - res.redirect(config.client.url) - }) - - /** - * Get our initialized service so that we can register hooks - */ - const service = app.service('subscription-confirm') - - service.hooks(hooks) -} diff --git a/packages/server-core/src/payments/subscription-level/subscription-level.class.ts b/packages/server-core/src/payments/subscription-level/subscription-level.class.ts deleted file mode 100755 index a6b47556c9..0000000000 --- a/packages/server-core/src/payments/subscription-level/subscription-level.class.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SequelizeServiceOptions, Service } from 'feathers-sequelize' - -import { SubscriptionLevelInterface } from '@xrengine/common/src/dbmodels/SubscriptionLevel' - -import { Application } from '../../../declarations' - -export type SubscriptionLevelDataType = SubscriptionLevelInterface -/** - * A class for Subscription Level service - */ -export class SubscriptionLevel extends Service { - public docs: any - constructor(options: Partial, app: Application) { - super(options) - } -} diff --git a/packages/server-core/src/payments/subscription-level/subscription-level.docs.ts b/packages/server-core/src/payments/subscription-level/subscription-level.docs.ts deleted file mode 100755 index dee801d352..0000000000 --- a/packages/server-core/src/payments/subscription-level/subscription-level.docs.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * An object for swagger documentation configuration - */ -export default { - definitions: { - 'subscription-level': { - type: 'object', - properties: { - level: { - type: 'string' - } - } - }, - 'subscription-level_list': { - type: 'array', - items: { $ref: '#/definitions/subscription-level' } - } - } -} diff --git a/packages/server-core/src/payments/subscription-level/subscription-level.hooks.ts b/packages/server-core/src/payments/subscription-level/subscription-level.hooks.ts deleted file mode 100755 index a507d59e43..0000000000 --- a/packages/server-core/src/payments/subscription-level/subscription-level.hooks.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { disallow } from 'feathers-hooks-common' - -export default { - before: { - all: [], - find: [], - get: [], - create: [disallow('external')], - update: [disallow()], - patch: [disallow()], - remove: [disallow('external')] - }, - - after: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - }, - - error: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - } -} as any diff --git a/packages/server-core/src/payments/subscription-level/subscription-level.model.ts b/packages/server-core/src/payments/subscription-level/subscription-level.model.ts deleted file mode 100755 index 18e580b0fc..0000000000 --- a/packages/server-core/src/payments/subscription-level/subscription-level.model.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { DataTypes, Model, Sequelize } from 'sequelize' - -import { SubscriptionLevelInterface } from '@xrengine/common/src/dbmodels/SubscriptionLevel' - -import { Application } from '../../../declarations' - -export default (app: Application) => { - const sequelizeClient: Sequelize = app.get('sequelizeClient') - const subscriptionLevel = sequelizeClient.define>( - 'subscription_level', - { - level: { - type: DataTypes.STRING, - allowNull: false, - primaryKey: true, - unique: true - } - }, - { - hooks: { - beforeCount(options: any): void { - options.raw = true - }, - beforeUpdate(instance: any, options: any): void { - throw new Error("Can't update a type!") - } - }, - timestamps: false - } - ) - - ;(subscriptionLevel as any).associate = (models: any): void => { - ;(subscriptionLevel as any).hasMany(models.static_resource, { foreignKey: 'subscriptionLevel' }) - } - - return subscriptionLevel -} diff --git a/packages/server-core/src/payments/subscription-level/subscription-level.seed.ts b/packages/server-core/src/payments/subscription-level/subscription-level.seed.ts deleted file mode 100755 index f0ae9b6968..0000000000 --- a/packages/server-core/src/payments/subscription-level/subscription-level.seed.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const subscriptionLevelSeed = { - path: 'subscription-level', - templates: [{ level: 'all' }, { level: 'paid' }] -} diff --git a/packages/server-core/src/payments/subscription-level/subscription-level.service.ts b/packages/server-core/src/payments/subscription-level/subscription-level.service.ts deleted file mode 100755 index a9f8f3a157..0000000000 --- a/packages/server-core/src/payments/subscription-level/subscription-level.service.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Application } from '../../../declarations' -import { SubscriptionLevel } from './subscription-level.class' -import subscriptionLevelDocs from './subscription-level.docs' -import hooks from './subscription-level.hooks' -import createModel from './subscription-level.model' - -declare module '@xrengine/common/declarations' { - interface ServiceTypes { - 'subscription-level': SubscriptionLevel - } -} - -export default (app: Application) => { - const options = { - Model: createModel(app), - paginate: app.get('paginate'), - multi: true - } - - /** - * Initialize our service with any options it requires and docs - */ - const event = new SubscriptionLevel(options, app) - event.docs = subscriptionLevelDocs - app.use('subscription-level', event) - - /** - * Get our initialized service so that we can register hooks - */ - const service = app.service('subscription-level') - - service.hooks(hooks) -} diff --git a/packages/server-core/src/payments/subscription-type/subscription-type.class.ts b/packages/server-core/src/payments/subscription-type/subscription-type.class.ts deleted file mode 100755 index e3e4d73c26..0000000000 --- a/packages/server-core/src/payments/subscription-type/subscription-type.class.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { SequelizeServiceOptions, Service } from 'feathers-sequelize' - -import { SubscriptionTypeInterface } from '@xrengine/common/src/dbmodels/SubscriptionType' - -import { Application } from '../../../declarations' - -export type SubscriptionTypeDataType = SubscriptionTypeInterface - -/** - * A class for Subscription Type service - */ -export class SubscriptionType extends Service { - public docs: any - constructor(options: Partial, app: Application) { - super(options) - } -} diff --git a/packages/server-core/src/payments/subscription-type/subscription-type.docs.ts b/packages/server-core/src/payments/subscription-type/subscription-type.docs.ts deleted file mode 100755 index 0dcce4d058..0000000000 --- a/packages/server-core/src/payments/subscription-type/subscription-type.docs.ts +++ /dev/null @@ -1,34 +0,0 @@ -/** - * An object for swagger documentation configuration - */ -export default { - definitions: { - 'subscription-type': { - type: 'object', - properties: { - plan: { - type: 'string' - }, - name: { - type: 'string' - }, - type: { - type: 'string' - }, - description: { - type: 'string' - }, - amount: { - type: 'integer' - }, - seats: { - type: 'string' - } - } - }, - 'subscription-type_list': { - type: 'array', - items: { $ref: '#/definitions/subscription-type' } - } - } -} diff --git a/packages/server-core/src/payments/subscription-type/subscription-type.hooks.ts b/packages/server-core/src/payments/subscription-type/subscription-type.hooks.ts deleted file mode 100755 index a507d59e43..0000000000 --- a/packages/server-core/src/payments/subscription-type/subscription-type.hooks.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { disallow } from 'feathers-hooks-common' - -export default { - before: { - all: [], - find: [], - get: [], - create: [disallow('external')], - update: [disallow()], - patch: [disallow()], - remove: [disallow('external')] - }, - - after: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - }, - - error: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - } -} as any diff --git a/packages/server-core/src/payments/subscription-type/subscription-type.model.ts b/packages/server-core/src/payments/subscription-type/subscription-type.model.ts deleted file mode 100755 index f8c21ac4b1..0000000000 --- a/packages/server-core/src/payments/subscription-type/subscription-type.model.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { DataTypes, Model, Sequelize } from 'sequelize' - -import { SubscriptionTypeInterface } from '@xrengine/common/src/dbmodels/SubscriptionType' - -import { Application } from '../../../declarations' - -export default (app: Application) => { - const sequelizeClient: Sequelize = app.get('sequelizeClient') - const subscriptionType = sequelizeClient.define>( - 'subscription_type', - { - plan: { - type: DataTypes.STRING, - allowNull: false, - primaryKey: true, - unique: true - }, - name: { - type: DataTypes.STRING, - allowNull: false - }, - type: { - type: DataTypes.STRING, - allowNull: false - }, - description: { - type: DataTypes.STRING, - allowNull: true - }, - amount: { - type: DataTypes.DOUBLE, - allowNull: false - }, - seats: { - type: DataTypes.INTEGER, - allowNull: false - } - }, - { - hooks: { - beforeCount(options: any): void { - options.raw = true - } - } - } - ) - - ;(subscriptionType as any).associate = (models: any): void => { - ;(subscriptionType as any).hasMany(models.subscription, { foreignKey: 'plan' }) - } - - return subscriptionType -} diff --git a/packages/server-core/src/payments/subscription-type/subscription-type.seed.ts b/packages/server-core/src/payments/subscription-type/subscription-type.seed.ts deleted file mode 100755 index df3f3f9adc..0000000000 --- a/packages/server-core/src/payments/subscription-type/subscription-type.seed.ts +++ /dev/null @@ -1,111 +0,0 @@ -import config from '../../appconfig' - -const localTemplates = [ - { - plan: 'xrengine-basic-local', - name: 'XREngine Basic Local', - type: 'monthly', - amount: 5, - seats: 1 - }, - { - plan: 'xrengine-premium-local', - name: 'XREngine Premium Local', - type: 'monthly', - amount: 20, - seats: 1 - }, - { - plan: 'xrengine-deluxe-local', - name: 'XREngine Deluxe Local', - type: 'monthly', - amount: 100, - seats: 1 - } -] - -const devTemplates = [ - { - plan: 'xrengine-basic-dev', - name: 'XREngine Basic Dev', - type: 'monthly', - amount: 5, - seats: 1 - }, - { - plan: 'xrengine-premium-dev', - name: 'XREngine Premium Dev', - type: 'monthly', - amount: 20, - seats: 1 - }, - { - plan: 'xrengine-deluxe-dev', - name: 'XREngine Deluxe Dev', - type: 'monthly', - amount: 100, - seats: 1 - } -] - -const stagingTemplates = [ - { - plan: 'xrengine-basic-staging', - name: 'XREngine Basic Staging', - type: 'monthly', - amount: 5, - seats: 1 - }, - { - plan: 'xrengine-premium-staging', - name: 'XREngine Premium Staging', - type: 'monthly', - amount: 20, - seats: 1 - }, - { - plan: 'xrengine-deluxe-staging', - name: 'XREngine Deluxe Staging', - type: 'monthly', - amount: 100, - seats: 1 - } -] - -const prodTemplates = [ - { - plan: 'xrengine-basic-prod', - name: 'XREngine Basic', - type: 'monthly', - amount: 5, - seats: 1 - }, - { - plan: 'xrengine-premium-prod', - name: 'XREngine Premium', - type: 'monthly', - amount: 20, - seats: 1 - }, - { - plan: 'xrengine-deluxe-prod', - name: 'XREngine Deluxe', - type: 'monthly', - amount: 100, - seats: 1 - } -] - -const templatesMap = { - local: localTemplates, - dev: devTemplates, - staging: stagingTemplates, - prod: prodTemplates -} - -const templateMap = config.deployStage ? templatesMap[config.deployStage] : templatesMap.local - -export const subscriptionTypeSeed = { - path: 'subscription-type', - templates: templateMap -} diff --git a/packages/server-core/src/payments/subscription-type/subscription-type.service.ts b/packages/server-core/src/payments/subscription-type/subscription-type.service.ts deleted file mode 100755 index dbd43b3894..0000000000 --- a/packages/server-core/src/payments/subscription-type/subscription-type.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Application } from '../../../declarations' -import { SubscriptionType } from './subscription-type.class' -import subscriptionTypeDocs from './subscription-type.docs' -import hooks from './subscription-type.hooks' -import createModel from './subscription-type.model' - -declare module '@xrengine/common/declarations' { - interface ServiceTypes { - 'subscription-type': SubscriptionType - } -} - -export default (app: Application) => { - const options = { - Model: createModel(app), - paginate: app.get('paginate'), - multi: true - } - - /** - * Initialize our service with any options it requires and docs - */ - const event = new SubscriptionType(options, app) - event.docs = subscriptionTypeDocs - - app.use('subscription-type', event) - - /** - * Get our initialized service so that we can register hooks - */ - const service = app.service('subscription-type') - - service.hooks(hooks) -} diff --git a/packages/server-core/src/payments/subscription/subscription.class.ts b/packages/server-core/src/payments/subscription/subscription.class.ts deleted file mode 100755 index 9f61b292c3..0000000000 --- a/packages/server-core/src/payments/subscription/subscription.class.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { Params } from '@feathersjs/feathers' -import { SequelizeServiceOptions, Service } from 'feathers-sequelize' - -import { SubscriptionInterface } from '@xrengine/common/src/dbmodels/Subscription' - -import { Application } from '../../../declarations' -import config from '../../appconfig' - -interface SubscriptionParams extends Params { - body?: { - userId: string - } -} - -export type SubscriptionDataType = SubscriptionInterface & { subscriptionId: string; paymentUrl: string } - -export class Subscription extends Service { - app: Application - docs: any - - constructor(options: Partial, app: Application) { - super(options) - this.app = app - } - - /** - * - * @param data for creating new subscription - * @param params which contains user info - * @returns {@Object} of created new subscription - */ - async create(data: any, params?: SubscriptionParams): Promise { - const userId = (params as any).connection['identity-provider'].userId || params?.body?.userId - if (userId == null) { - throw new Error('Invalid user') - } - - const unconfirmedSubscriptions = (await super.find({ - query: { - userId: userId, - status: 0 - } - })) as any - - await Promise.all( - unconfirmedSubscriptions.data.map((subscription: any) => { - return super.remove(subscription.id) - }) - ) - let plan: string - const found = await this.app.service('subscription-type').find({ - query: { - plan: data.plan - } - }) - if (!found) { - plan = 'monthly-subscription-free' - } else { - plan = data.plan - } - const saveData: any = { - userId, - plan, - amount: (found as any).data[0].amount ?? 0, - quantity: 1 - } - const saved: any = await super.create(saveData, params) - - const returned: any = { - subscriptionId: saved.id.toString(), - paymentUrl: `https://${config.chargebee.url}/hosted_pages/plans/${plan}?subscription[id]=${ - saved.id as string - }&customer[id]=${userId as string}` - } - - return returned as T - } -} diff --git a/packages/server-core/src/payments/subscription/subscription.docs.ts b/packages/server-core/src/payments/subscription/subscription.docs.ts deleted file mode 100755 index 2032384039..0000000000 --- a/packages/server-core/src/payments/subscription/subscription.docs.ts +++ /dev/null @@ -1,47 +0,0 @@ -/** - * An object for swagger documentation configuration - */ -export default { - definitions: { - subscription: { - type: 'object', - required: ['amount', 'currency', 'quantity', 'status'], - properties: { - plan: { - type: 'string' - }, - amaunt: { - type: 'string' - }, - currency: { - type: 'string' - }, - quantity: { - type: 'string' - }, - status: { - type: 'boolean' - }, - unusedSeats: { - type: 'integer' - }, - pendingSeats: { - type: 'integer' - }, - filledSeats: { - type: 'integer' - } - } - }, - subscription_list: { - type: 'array', - items: { $ref: '#/definitions/subscription' } - } - }, - securities: ['create', 'update', 'patch', 'remove'], - operations: { - find: { - security: [{ bearer: [] }] - } - } -} diff --git a/packages/server-core/src/payments/subscription/subscription.hooks.ts b/packages/server-core/src/payments/subscription/subscription.hooks.ts deleted file mode 100755 index 048ff9e951..0000000000 --- a/packages/server-core/src/payments/subscription/subscription.hooks.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { disallow, iff, isProvider } from 'feathers-hooks-common' - -import setLoggedInUser from '@xrengine/server-core/src/hooks/set-loggedin-user-in-body' -import setLoggedInUserInQuery from '@xrengine/server-core/src/hooks/set-loggedin-user-in-query' - -import authenticate from '../../hooks/authenticate' - -// Don't remove this comment. It's needed to format import lines nicely. - -export default { - before: { - all: [authenticate()], - find: [disallow('external')], - get: [iff(isProvider('external'), setLoggedInUserInQuery('userId') as any)], - create: [authenticate(), setLoggedInUser('userId')], - update: [disallow('external')], - patch: [disallow('external')], - remove: [disallow('external')] - }, - - after: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - }, - - error: { - all: [], - find: [], - get: [], - create: [], - update: [], - patch: [], - remove: [] - } -} as any diff --git a/packages/server-core/src/payments/subscription/subscription.model.ts b/packages/server-core/src/payments/subscription/subscription.model.ts deleted file mode 100755 index 3b525d2572..0000000000 --- a/packages/server-core/src/payments/subscription/subscription.model.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { DataTypes, Model, Sequelize } from 'sequelize' - -import { SubscriptionInterface } from '@xrengine/common/src/dbmodels/Subscription' - -import { Application } from '../../../declarations' - -export default (app: Application) => { - const sequelizeClient: Sequelize = app.get('sequelizeClient') - const subscription = sequelizeClient.define>( - 'subscription', - { - id: { - type: DataTypes.UUID, - defaultValue: DataTypes.UUIDV1, - allowNull: false, - primaryKey: true - }, - plan: { - type: DataTypes.STRING, - allowNull: true - }, - amount: { - type: DataTypes.DECIMAL, - allowNull: false - }, - currency: { - type: DataTypes.STRING, - defaultValue: 'usd', - allowNull: false - }, - quantity: { - type: DataTypes.INTEGER, - allowNull: false - }, - status: { - type: DataTypes.BOOLEAN, - defaultValue: false - }, - totalSeats: { - type: DataTypes.INTEGER - }, - unusedSeats: { - type: DataTypes.INTEGER - }, - pendingSeats: { - type: DataTypes.INTEGER - }, - filledSeats: { - type: DataTypes.INTEGER - } - }, - { - hooks: { - beforeCount(options: any): void { - options.raw = true - } - } - } - ) - - ;(subscription as any).associate = (models: any): void => { - ;(subscription as any).belongsTo(models.user) - ;(subscription as any).belongsTo(models.subscription_type, { foreignKey: 'plan', required: true }) - ;(subscription as any).hasMany(models.seat, { foreignKey: 'subscriptionId' }) - } - - return subscription -} diff --git a/packages/server-core/src/payments/subscription/subscription.service.ts b/packages/server-core/src/payments/subscription/subscription.service.ts deleted file mode 100755 index df6eafab3d..0000000000 --- a/packages/server-core/src/payments/subscription/subscription.service.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Application } from '../../../declarations' -import { Subscription } from './subscription.class' -import subscription from './subscription.docs' -import hooks from './subscription.hooks' -import createModel from './subscription.model' - -declare module '@xrengine/common/declarations' { - interface ServiceTypes { - subscription: Subscription - } -} - -export default (app: Application) => { - const options = { - Model: createModel(app), - paginate: app.get('paginate') - } - - /** - * Initialize our service with any options it requires and docs - */ - const event = new Subscription(options, app) - event.docs = subscription - - app.use('subscription', event) - - /** - * Get our initialized service so that we can register hooks - */ - const service = app.service('subscription') - - service.hooks(hooks) -} diff --git a/packages/server-core/src/projects/project-permission-type/project-permission-type.class.ts b/packages/server-core/src/projects/project-permission-type/project-permission-type.class.ts index fe5b352d24..c0b03aa86d 100644 --- a/packages/server-core/src/projects/project-permission-type/project-permission-type.class.ts +++ b/packages/server-core/src/projects/project-permission-type/project-permission-type.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { ProjectPermissionType as ProjectPermissionTypeInterface } from '@xrengine/common/src/interfaces/ProjectPermissionType' +import { ProjectPermissionType as ProjectPermissionTypeInterface } from '@etherealengine/common/src/interfaces/ProjectPermissionType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/projects/project-permission-type/project-permission-type.model.ts b/packages/server-core/src/projects/project-permission-type/project-permission-type.model.ts index a2996b23f6..d47b627322 100644 --- a/packages/server-core/src/projects/project-permission-type/project-permission-type.model.ts +++ b/packages/server-core/src/projects/project-permission-type/project-permission-type.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ScopeTypeInterface } from '@xrengine/common/src/dbmodels/ScopeType' +import { ScopeTypeInterface } from '@etherealengine/common/src/dbmodels/ScopeType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/projects/project-permission-type/project-permission-type.service.ts b/packages/server-core/src/projects/project-permission-type/project-permission-type.service.ts index 6580621671..afeb4f516f 100644 --- a/packages/server-core/src/projects/project-permission-type/project-permission-type.service.ts +++ b/packages/server-core/src/projects/project-permission-type/project-permission-type.service.ts @@ -4,7 +4,7 @@ import projectPermissionTypeDocs from './project-permission-type.docs' import hooks from './project-permission-type.hooks' import createModel from './project-permission-type.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'project-permission-type': ProjectPermissionType } diff --git a/packages/server-core/src/projects/project-permission/project-permission.class.ts b/packages/server-core/src/projects/project-permission/project-permission.class.ts index 85eb0e52b7..a283614714 100644 --- a/packages/server-core/src/projects/project-permission/project-permission.class.ts +++ b/packages/server-core/src/projects/project-permission/project-permission.class.ts @@ -2,7 +2,7 @@ import { BadRequest, Forbidden } from '@feathersjs/errors' import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { ProjectPermissionInterface } from '@xrengine/common/src/interfaces/ProjectPermissionInterface' +import { ProjectPermissionInterface } from '@etherealengine/common/src/interfaces/ProjectPermissionInterface' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/projects/project-permission/project-permission.model.ts b/packages/server-core/src/projects/project-permission/project-permission.model.ts index ede842a6c1..740bb4b872 100644 --- a/packages/server-core/src/projects/project-permission/project-permission.model.ts +++ b/packages/server-core/src/projects/project-permission/project-permission.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ProjectPermissionInterface } from '@xrengine/common/src/dbmodels/ProjectPermission' +import { ProjectPermissionInterface } from '@etherealengine/common/src/dbmodels/ProjectPermission' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/projects/project-permission/project-permission.service.ts b/packages/server-core/src/projects/project-permission/project-permission.service.ts index d9750e76ca..cdd0401cb9 100644 --- a/packages/server-core/src/projects/project-permission/project-permission.service.ts +++ b/packages/server-core/src/projects/project-permission/project-permission.service.ts @@ -4,7 +4,7 @@ import projectPermissionDocs from './project-permission.docs' import hooks from './project-permission.hooks' import createModel from './project-permission.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'project-permission': ProjectPermission } diff --git a/packages/server-core/src/projects/project-permission/project-permission.test.ts b/packages/server-core/src/projects/project-permission/project-permission.test.ts index 40344c032b..eb9fcfdac7 100644 --- a/packages/server-core/src/projects/project-permission/project-permission.test.ts +++ b/packages/server-core/src/projects/project-permission/project-permission.test.ts @@ -3,8 +3,8 @@ import appRootPath from 'app-root-path' import assert from 'assert' import path from 'path' -import { ProjectPermissionInterface } from '@xrengine/common/src/interfaces/ProjectPermissionInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { ProjectPermissionInterface } from '@etherealengine/common/src/interfaces/ProjectPermissionInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import { createFeathersExpressApp } from '../../createApp' diff --git a/packages/server-core/src/projects/project/github-helper.ts b/packages/server-core/src/projects/project/github-helper.ts index fd00a5f805..a372dbd869 100755 --- a/packages/server-core/src/projects/project/github-helper.ts +++ b/packages/server-core/src/projects/project/github-helper.ts @@ -4,15 +4,15 @@ import appRootPath from 'app-root-path' import fs from 'fs' import path from 'path' -import { GITHUB_PER_PAGE, GITHUB_URL_REGEX } from '@xrengine/common/src/constants/GitHubConstants' -import { ProjectInterface } from '@xrengine/common/src/interfaces/ProjectInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { GITHUB_PER_PAGE, GITHUB_URL_REGEX } from '@etherealengine/common/src/constants/GitHubConstants' +import { ProjectInterface } from '@etherealengine/common/src/interfaces/ProjectInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { AudioFileTypes, ImageFileTypes, VideoFileTypes, VolumetricFileTypes -} from '@xrengine/engine/src/assets/constants/fileTypes' +} from '@etherealengine/engine/src/assets/constants/fileTypes' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/projects/project/project-helper.ts b/packages/server-core/src/projects/project/project-helper.ts index ed9a211b2c..d45879ee8f 100644 --- a/packages/server-core/src/projects/project/project-helper.ts +++ b/packages/server-core/src/projects/project/project-helper.ts @@ -7,10 +7,10 @@ import path from 'path' import semver from 'semver' import Sequelize, { Op } from 'sequelize' -import { BuilderTag } from '@xrengine/common/src/interfaces/BuilderTags' -import { ProjectCommitInterface } from '@xrengine/common/src/interfaces/ProjectCommitInterface' -import { ProjectInterface, ProjectPackageJsonType } from '@xrengine/common/src/interfaces/ProjectInterface' -import { ProjectConfigInterface, ProjectEventHooks } from '@xrengine/projects/ProjectConfigInterface' +import { BuilderTag } from '@etherealengine/common/src/interfaces/BuilderTags' +import { ProjectCommitInterface } from '@etherealengine/common/src/interfaces/ProjectCommitInterface' +import { ProjectInterface, ProjectPackageJsonType } from '@etherealengine/common/src/interfaces/ProjectInterface' +import { ProjectConfigInterface, ProjectEventHooks } from '@etherealengine/projects/ProjectConfigInterface' import { Application } from '../../../declarations' import config from '../../appconfig' @@ -77,7 +77,7 @@ export const updateBuilder = async ( logger.info('Attempting to update builder tag') const builderRepo = process.env.BUILDER_REPOSITORY const updateBuilderTagResponse = await app.k8AppsClient.patchNamespacedDeployment( - `${config.server.releaseName}-builder-xrengine-builder`, + `${config.server.releaseName}-builder-etherealengine-builder`, 'default', { spec: { @@ -90,7 +90,7 @@ export const updateBuilder = async ( spec: { containers: [ { - name: 'xrengine-builder', + name: 'etherealengine-builder', image: `${builderRepo}:${tag}` } ] @@ -126,7 +126,7 @@ export const checkBuilderService = async (app: Application): Promise => logger.info('Attempting to check k8s rebuild status') const builderLabelSelector = `app.kubernetes.io/instance=${config.server.releaseName}-builder` - const containerName = 'xrengine-builder' + const containerName = 'etherealengine-builder' const builderPods = await app.k8DefaultClient.listNamespacedPod( 'default', @@ -193,7 +193,7 @@ export const onProjectEvent = async ( export const getProjectConfig = async (projectName: string): Promise => { try { - return (await import(`@xrengine/projects/projects/${projectName}/xrengine.config.ts`)).default + return (await import(`@etherealengine/projects/projects/${projectName}/xrengine.config.ts`)).default } catch (e) { logger.error( e, @@ -718,7 +718,8 @@ export const findBuilderTags = async (): Promise> => { } else { const repoSplit = builderRepo.split('/') const registry = repoSplit.length === 1 ? 'lagunalabs' : repoSplit[0] - const repo = repoSplit.length === 1 ? (repoSplit[0].length === 0 ? 'xrengine-builder' : repoSplit[0]) : repoSplit[1] + const repo = + repoSplit.length === 1 ? (repoSplit[0].length === 0 ? 'etherealengine-builder' : repoSplit[0]) : repoSplit[1] try { const result = await axios.get( `https://registry.hub.docker.com/v2/repositories/${registry}/${repo}/tags?page_size=100` @@ -817,7 +818,7 @@ export const getCronJobBody = (project: ProjectInterface, image: string): object } }, spec: { - serviceAccountName: `${process.env.RELEASE_NAME}-xrengine-api`, + serviceAccountName: `${process.env.RELEASE_NAME}-etherealengine-api`, containers: [ { name: `${process.env.RELEASE_NAME}-${project.name}-auto-update`, @@ -852,7 +853,7 @@ export const createOrUpdateProjectUpdateJob = async (app: Application, projectNa app ) - const image = apiPods.pods[0].containers.find((container) => container.name === 'xrengine')!.image + const image = apiPods.pods[0].containers.find((container) => container.name === 'etherealengine')!.image if (app.k8BatchClient) { try { diff --git a/packages/server-core/src/projects/project/project.class.ts b/packages/server-core/src/projects/project/project.class.ts index 6e3a49bd6b..83d2bbb3c3 100644 --- a/packages/server-core/src/projects/project/project.class.ts +++ b/packages/server-core/src/projects/project/project.class.ts @@ -6,15 +6,15 @@ import fs from 'fs' import path from 'path' import Sequelize, { Op } from 'sequelize' -import { GITHUB_URL_REGEX, PUBLIC_SIGNED_REGEX } from '@xrengine/common/src/constants/GitHubConstants' +import { GITHUB_URL_REGEX, PUBLIC_SIGNED_REGEX } from '@etherealengine/common/src/constants/GitHubConstants' import { DefaultUpdateSchedule, ProjectInterface, ProjectUpdateType -} from '@xrengine/common/src/interfaces/ProjectInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import { processFileName } from '@xrengine/common/src/utils/processFileName' -import templateProjectJson from '@xrengine/projects/template-project/package.json' +} from '@etherealengine/common/src/interfaces/ProjectInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import { processFileName } from '@etherealengine/common/src/utils/processFileName' +import templateProjectJson from '@etherealengine/projects/template-project/package.json' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/projects/project/project.model.ts b/packages/server-core/src/projects/project/project.model.ts index b306fd2550..ed1f9216d4 100644 --- a/packages/server-core/src/projects/project/project.model.ts +++ b/packages/server-core/src/projects/project/project.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ProjectInterface } from '@xrengine/common/src/dbmodels/Project' +import { ProjectInterface } from '@etherealengine/common/src/dbmodels/Project' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/projects/project/project.service.ts b/packages/server-core/src/projects/project/project.service.ts index 589ef3a14d..f07d970a2f 100644 --- a/packages/server-core/src/projects/project/project.service.ts +++ b/packages/server-core/src/projects/project/project.service.ts @@ -5,8 +5,8 @@ import fs from 'fs' import _ from 'lodash' import path from 'path' -import { UserInterface } from '@xrengine/common/src/dbmodels/UserInterface' -import logger from '@xrengine/common/src/logger' +import { UserInterface } from '@etherealengine/common/src/dbmodels/UserInterface' +import logger from '@etherealengine/common/src/logger' import { Application } from '../../../declarations' import config from '../../appconfig' @@ -34,7 +34,7 @@ import hooks from './project.hooks' import createModel from './project.model' const projectsRootFolder = path.join(appRootPath.path, 'packages/projects/projects/') -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { projects: { find: () => ReturnType @@ -155,7 +155,7 @@ export const builderInfoGet = (app: Application) => async () => { `app.kubernetes.io/instance=${config.server.releaseName}-builder` ) const builderContainer = builderDeployment?.body?.items[0]?.spec?.template?.spec?.containers?.find( - (container) => container.name === 'xrengine-builder' + (container) => container.name === 'etherealengine-builder' ) if (builderContainer) { const image = builderContainer.image diff --git a/packages/server-core/src/projects/scene/scene-helper.ts b/packages/server-core/src/projects/scene/scene-helper.ts index ee561575a5..615092243a 100644 --- a/packages/server-core/src/projects/scene/scene-helper.ts +++ b/packages/server-core/src/projects/scene/scene-helper.ts @@ -1,6 +1,6 @@ import express from 'express' -import { PortalDetail } from '@xrengine/common/src/interfaces/PortalInterface' +import { PortalDetail } from '@etherealengine/common/src/interfaces/PortalInterface' import { Application } from '../../../declarations' import { parseScenePortals } from './scene-parser' diff --git a/packages/server-core/src/projects/scene/scene-parser.ts b/packages/server-core/src/projects/scene/scene-parser.ts index 1d5b1357f1..6667ab5513 100644 --- a/packages/server-core/src/projects/scene/scene-parser.ts +++ b/packages/server-core/src/projects/scene/scene-parser.ts @@ -1,6 +1,6 @@ -import config from '@xrengine/common/src/config' -import { PortalDetail } from '@xrengine/common/src/interfaces/PortalInterface' -import { SceneData, SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' +import config from '@etherealengine/common/src/config' +import { PortalDetail } from '@etherealengine/common/src/interfaces/PortalInterface' +import { SceneData, SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' import { getCachedURL } from '../../media/storageprovider/getCachedURL' diff --git a/packages/server-core/src/projects/scene/scene-schema-parse.test.ts b/packages/server-core/src/projects/scene/scene-schema-parse.test.ts index fbc2cc3e4e..d9369d78b8 100644 --- a/packages/server-core/src/projects/scene/scene-schema-parse.test.ts +++ b/packages/server-core/src/projects/scene/scene-schema-parse.test.ts @@ -1,7 +1,7 @@ import assert from 'assert' import _ from 'lodash' -import config from '@xrengine/common/src/config' +import config from '@etherealengine/common/src/config' import { createDefaultStorageProvider, getStorageProvider } from '../../media/storageprovider/storageprovider' import { diff --git a/packages/server-core/src/projects/scene/scene.class.ts b/packages/server-core/src/projects/scene/scene.class.ts index 407d451d04..c0e86b65ab 100644 --- a/packages/server-core/src/projects/scene/scene.class.ts +++ b/packages/server-core/src/projects/scene/scene.class.ts @@ -3,9 +3,9 @@ import appRootPath from 'app-root-path' import fs from 'fs' import path from 'path' -import { isDev } from '@xrengine/common/src/config' -import { SceneData, SceneJson } from '@xrengine/common/src/interfaces/SceneInterface' -import defaultSceneSeed from '@xrengine/projects/default-project/default.scene.json' +import { isDev } from '@etherealengine/common/src/config' +import { SceneData, SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface' +import defaultSceneSeed from '@etherealengine/projects/default-project/default.scene.json' import { Application } from '../../../declarations' import { getCacheDomain } from '../../media/storageprovider/getCacheDomain' diff --git a/packages/server-core/src/projects/scene/scene.service.ts b/packages/server-core/src/projects/scene/scene.service.ts index 03c354cb51..f0006ad5ba 100755 --- a/packages/server-core/src/projects/scene/scene.service.ts +++ b/packages/server-core/src/projects/scene/scene.service.ts @@ -2,7 +2,7 @@ import { Params } from '@feathersjs/feathers' import express from 'express' import multer from 'multer' -import { SceneData } from '@xrengine/common/src/interfaces/SceneInterface' +import { SceneData } from '@etherealengine/common/src/interfaces/SceneInterface' import { Application, ServerMode } from '../../../declarations' import { getStorageProvider } from '../../media/storageprovider/storageprovider' @@ -14,7 +14,7 @@ import { getSceneData, Scene } from './scene.class' import projectDocs from './scene.docs' import hooks from './scene.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { scene: Scene 'scene/upload': { diff --git a/packages/server-core/src/projects/scene/scene.test.ts b/packages/server-core/src/projects/scene/scene.test.ts index 78cc5fac6f..d959bbfeba 100644 --- a/packages/server-core/src/projects/scene/scene.test.ts +++ b/packages/server-core/src/projects/scene/scene.test.ts @@ -3,7 +3,7 @@ import assert from 'assert' import _ from 'lodash' import path from 'path' -import defaultSceneSeed from '@xrengine/projects/default-project/default.scene.json' +import defaultSceneSeed from '@etherealengine/projects/default-project/default.scene.json' import { Application } from '../../../declarations' import { createFeathersExpressApp } from '../../createApp' diff --git a/packages/server-core/src/projects/seeder-config.ts b/packages/server-core/src/projects/seeder-config.ts index a85a7b0411..8018dfdf46 100644 --- a/packages/server-core/src/projects/seeder-config.ts +++ b/packages/server-core/src/projects/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { projectPermissionTypeSeed } from './project-permission-type/project-permission-type.seed' diff --git a/packages/server-core/src/route/route/route.class.ts b/packages/server-core/src/route/route/route.class.ts index 631222a315..a53366386a 100644 --- a/packages/server-core/src/route/route/route.class.ts +++ b/packages/server-core/src/route/route/route.class.ts @@ -1,7 +1,7 @@ import { Paginated } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { ActiveRoutesInterface } from '@xrengine/common/src/interfaces/Route' +import { ActiveRoutesInterface } from '@etherealengine/common/src/interfaces/Route' import { Application } from '../../../declarations' import { UserParams } from '../../user/user/user.class' diff --git a/packages/server-core/src/route/route/route.model.ts b/packages/server-core/src/route/route/route.model.ts index 85f082cb66..c8ed9a1553 100644 --- a/packages/server-core/src/route/route/route.model.ts +++ b/packages/server-core/src/route/route/route.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { RouteInterface } from '@xrengine/common/src/dbmodels/Route' +import { RouteInterface } from '@etherealengine/common/src/dbmodels/Route' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/route/route/route.service.ts b/packages/server-core/src/route/route/route.service.ts index 819a96c84b..74b453e1bd 100644 --- a/packages/server-core/src/route/route/route.service.ts +++ b/packages/server-core/src/route/route/route.service.ts @@ -2,8 +2,8 @@ import { Params } from '@feathersjs/feathers' import fs from 'fs' import path from 'path' -import { ActiveRoutesInterface, InstalledRoutesInterface } from '@xrengine/common/src/interfaces/Route' -import { ProjectConfigInterface } from '@xrengine/projects/ProjectConfigInterface' +import { ActiveRoutesInterface, InstalledRoutesInterface } from '@etherealengine/common/src/interfaces/Route' +import { ProjectConfigInterface } from '@etherealengine/projects/ProjectConfigInterface' import { Application } from '../../../declarations' import logger from '../../ServerLogger' @@ -12,7 +12,7 @@ import routeDocs from './route.docs' import hooks from './route.hooks' import createModel from './route.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { route: Route } @@ -43,7 +43,7 @@ export const getInstalledRoutes = (): any => { try { if (fs.existsSync(path.resolve(__dirname, `../../../../projects/projects/${project}/xrengine.config.ts`))) { const projectConfig: ProjectConfigInterface = ( - await import(`@xrengine/projects/projects/${project}/xrengine.config.ts`) + await import(`@etherealengine/projects/projects/${project}/xrengine.config.ts`) ).default data.push({ routes: Object.keys(projectConfig.routes!), diff --git a/packages/server-core/src/route/seeder-config.ts b/packages/server-core/src/route/seeder-config.ts index 2b82c315f1..59c4e471d0 100644 --- a/packages/server-core/src/route/seeder-config.ts +++ b/packages/server-core/src/route/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { routeSeedData } from './route/route.seed' diff --git a/packages/server-core/src/scope/scope-type/scope-type.class.ts b/packages/server-core/src/scope/scope-type/scope-type.class.ts index efaa7e65a4..0f71f3fd13 100644 --- a/packages/server-core/src/scope/scope-type/scope-type.class.ts +++ b/packages/server-core/src/scope/scope-type/scope-type.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { AdminScopeType as ScopeTypeInterface } from '@xrengine/common/src/interfaces/AdminScopeType' +import { AdminScopeType as ScopeTypeInterface } from '@etherealengine/common/src/interfaces/AdminScopeType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/scope/scope-type/scope-type.model.ts b/packages/server-core/src/scope/scope-type/scope-type.model.ts index 0bb0ee2f05..a91dce2471 100644 --- a/packages/server-core/src/scope/scope-type/scope-type.model.ts +++ b/packages/server-core/src/scope/scope-type/scope-type.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ScopeTypeInterface } from '@xrengine/common/src/dbmodels/ScopeType' +import { ScopeTypeInterface } from '@etherealengine/common/src/dbmodels/ScopeType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/scope/scope-type/scope-type.service.ts b/packages/server-core/src/scope/scope-type/scope-type.service.ts index 5d5aff7af2..eafe918a05 100644 --- a/packages/server-core/src/scope/scope-type/scope-type.service.ts +++ b/packages/server-core/src/scope/scope-type/scope-type.service.ts @@ -4,7 +4,7 @@ import scopeTypeDocs from './scope-type.docs' import hooks from './scope-type.hooks' import createModel from './scope-type.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'scope-type': ScopeType } diff --git a/packages/server-core/src/scope/scope/scope.class.ts b/packages/server-core/src/scope/scope/scope.class.ts index dca4d1ab9f..1cc59b92e8 100644 --- a/packages/server-core/src/scope/scope/scope.class.ts +++ b/packages/server-core/src/scope/scope/scope.class.ts @@ -1,7 +1,7 @@ import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { AdminScope as AdminScopeInterface } from '@xrengine/common/src/interfaces/AdminScope' +import { AdminScope as AdminScopeInterface } from '@etherealengine/common/src/interfaces/AdminScope' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/scope/scope/scope.model.ts b/packages/server-core/src/scope/scope/scope.model.ts index 74f8c14b1a..cbe73d9776 100644 --- a/packages/server-core/src/scope/scope/scope.model.ts +++ b/packages/server-core/src/scope/scope/scope.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ScopeInterface } from '@xrengine/common/src/dbmodels/Scope' +import { ScopeInterface } from '@etherealengine/common/src/dbmodels/Scope' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/scope/scope/scope.service.ts b/packages/server-core/src/scope/scope/scope.service.ts index 1f83f3e37b..e689cc6f0c 100644 --- a/packages/server-core/src/scope/scope/scope.service.ts +++ b/packages/server-core/src/scope/scope/scope.service.ts @@ -4,7 +4,7 @@ import scopeDocs from './scope.docs' import hooks from './scope.hooks' import createModel from './scope.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { scope: Scope } diff --git a/packages/server-core/src/scope/seeder-config.ts b/packages/server-core/src/scope/seeder-config.ts index feaceccb72..90ffbcdf08 100644 --- a/packages/server-core/src/scope/seeder-config.ts +++ b/packages/server-core/src/scope/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { scopeTypeSeed } from './scope-type/scope-type.seed' diff --git a/packages/server-core/src/seeder-config.ts b/packages/server-core/src/seeder-config.ts index 026326355a..bfb7b4f8e0 100755 --- a/packages/server-core/src/seeder-config.ts +++ b/packages/server-core/src/seeder-config.ts @@ -1,13 +1,12 @@ import fs from 'fs' import path from 'path' -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' -import { ProjectConfigInterface } from '@xrengine/projects/ProjectConfigInterface' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' +import { ProjectConfigInterface } from '@etherealengine/projects/ProjectConfigInterface' import { analyticsSeeds } from './analytics/seeder-config' import { mediaSeeds } from './media/seeder-config' import { networkingSeeds } from './networking/seeder-config' -import { paymentSeeds } from './payments/seeder-config' import { projectSeeds } from './projects/seeder-config' import { routeSeeds } from './route/seeder-config' import { scopeSeeds } from './scope/seeder-config' @@ -37,7 +36,6 @@ const installedProjects = fs.existsSync(path.resolve(__dirname, '../../projects/ export const seeds: Array = [ ...mediaSeeds, ...networkingSeeds, - ...paymentSeeds, ...socialSeeds, ...userSeeds, ...scopeSeeds, diff --git a/packages/server-core/src/sequelize.ts b/packages/server-core/src/sequelize.ts index 3f38961b97..187695758a 100755 --- a/packages/server-core/src/sequelize.ts +++ b/packages/server-core/src/sequelize.ts @@ -1,7 +1,7 @@ import { Sequelize } from 'sequelize' -import config, { isDev } from '@xrengine/common/src/config' -import appConfig from '@xrengine/server-core/src/appconfig' +import config, { isDev } from '@etherealengine/common/src/config' +import appConfig from '@etherealengine/server-core/src/appconfig' import { Application } from '../declarations' import { seeder } from './seeder' @@ -38,7 +38,7 @@ export default (app: Application): void => { await sequelize.query('SET FOREIGN_KEY_CHECKS = 0') const tableCount = await sequelize.query( - `select table_schema as xrengine,count(*) as tables from information_schema.tables where table_type = \'BASE TABLE\' and table_schema not in (\'information_schema\', \'sys\', \'performance_schema\', \'mysql\') group by table_schema order by table_schema;` + `select table_schema as etherealengine,count(*) as tables from information_schema.tables where table_type = \'BASE TABLE\' and table_schema not in (\'information_schema\', \'sys\', \'performance_schema\', \'mysql\') group by table_schema order by table_schema;` ) const prepareDb = process.env.PREPARE_DATABASE === 'true' || (isDev && tableCount[0] && !tableCount[0][0]) // Sync to the database diff --git a/packages/server-core/src/services.ts b/packages/server-core/src/services.ts index 3d5933daae..f1a4d0cbdb 100755 --- a/packages/server-core/src/services.ts +++ b/packages/server-core/src/services.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' -import { ProjectConfigInterface } from '@xrengine/projects/ProjectConfigInterface' +import { ProjectConfigInterface } from '@etherealengine/projects/ProjectConfigInterface' import { Application } from '../declarations' import AnalyticsServices from './analytics/services' diff --git a/packages/server-core/src/setting/authentication-setting/authentication.class.ts b/packages/server-core/src/setting/authentication-setting/authentication.class.ts index 4a73d394d1..9b6fc5ce9f 100644 --- a/packages/server-core/src/setting/authentication-setting/authentication.class.ts +++ b/packages/server-core/src/setting/authentication-setting/authentication.class.ts @@ -1,8 +1,8 @@ import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { AdminAuthSetting as AdminAuthSettingInterface } from '@xrengine/common/src/interfaces/AdminAuthSetting' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { AdminAuthSetting as AdminAuthSettingInterface } from '@etherealengine/common/src/interfaces/AdminAuthSetting' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' @@ -99,7 +99,7 @@ export class Authentication extends Service { try { logger.info('Attempting to refresh API pods') const refreshApiPodResponse = await this.app.k8AppsClient.patchNamespacedDeployment( - `${config.server.releaseName}-xrengine-api`, + `${config.server.releaseName}-etherealengine-api`, 'default', { spec: { diff --git a/packages/server-core/src/setting/authentication-setting/authentication.model.ts b/packages/server-core/src/setting/authentication-setting/authentication.model.ts index cf636c8de4..beff0ccb97 100644 --- a/packages/server-core/src/setting/authentication-setting/authentication.model.ts +++ b/packages/server-core/src/setting/authentication-setting/authentication.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { AuthenticationInterface } from '@xrengine/common/src/dbmodels/Authentication' +import { AuthenticationInterface } from '@etherealengine/common/src/dbmodels/Authentication' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/authentication-setting/authentication.service.ts b/packages/server-core/src/setting/authentication-setting/authentication.service.ts index 476ca34925..e7fc320997 100644 --- a/packages/server-core/src/setting/authentication-setting/authentication.service.ts +++ b/packages/server-core/src/setting/authentication-setting/authentication.service.ts @@ -8,7 +8,7 @@ import { Authentication } from './authentication.class' import hooks from './authentication.hooks' import createModel from './authentication.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'authentication-setting': Authentication } diff --git a/packages/server-core/src/setting/aws-setting/aws-setting.class.ts b/packages/server-core/src/setting/aws-setting/aws-setting.class.ts index 3db75d6f6d..f99c3b1e46 100644 --- a/packages/server-core/src/setting/aws-setting/aws-setting.class.ts +++ b/packages/server-core/src/setting/aws-setting/aws-setting.class.ts @@ -1,7 +1,7 @@ import { NullableId, Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { AdminAwsSetting as AdminAwsSettingInterface } from '@xrengine/common/src/interfaces/AdminAwsSetting' +import { AdminAwsSetting as AdminAwsSettingInterface } from '@etherealengine/common/src/interfaces/AdminAwsSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/aws-setting/aws-setting.model.ts b/packages/server-core/src/setting/aws-setting/aws-setting.model.ts index c4fabf6431..ccfc23e70c 100644 --- a/packages/server-core/src/setting/aws-setting/aws-setting.model.ts +++ b/packages/server-core/src/setting/aws-setting/aws-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { AwsInterface } from '@xrengine/common/src/dbmodels/Aws' +import { AwsInterface } from '@etherealengine/common/src/dbmodels/Aws' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/aws-setting/aws-setting.service.ts b/packages/server-core/src/setting/aws-setting/aws-setting.service.ts index 72fe6743ae..1127fc3d28 100644 --- a/packages/server-core/src/setting/aws-setting/aws-setting.service.ts +++ b/packages/server-core/src/setting/aws-setting/aws-setting.service.ts @@ -4,7 +4,7 @@ import { Aws } from './aws-setting.class' import hooks from './aws-setting.hooks' import createModel from './aws-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'aws-setting': Aws } diff --git a/packages/server-core/src/setting/chargebee-setting/chargebee-setting.class.ts b/packages/server-core/src/setting/chargebee-setting/chargebee-setting.class.ts index d8f2e5ecf4..c70c8ae60d 100644 --- a/packages/server-core/src/setting/chargebee-setting/chargebee-setting.class.ts +++ b/packages/server-core/src/setting/chargebee-setting/chargebee-setting.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { ChargebeeSetting as ChargebeeSettingDataType } from '@xrengine/common/src/interfaces/ChargebeeSetting' +import { ChargebeeSetting as ChargebeeSettingDataType } from '@etherealengine/common/src/interfaces/ChargebeeSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/chargebee-setting/chargebee-setting.model.ts b/packages/server-core/src/setting/chargebee-setting/chargebee-setting.model.ts index 5f3d26f4b1..00c6fb5b60 100644 --- a/packages/server-core/src/setting/chargebee-setting/chargebee-setting.model.ts +++ b/packages/server-core/src/setting/chargebee-setting/chargebee-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ChargebeeSettingInterface } from '@xrengine/common/src/dbmodels/ChargebeeSetting' +import { ChargebeeSettingInterface } from '@etherealengine/common/src/dbmodels/ChargebeeSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/chargebee-setting/chargebee-setting.service.ts b/packages/server-core/src/setting/chargebee-setting/chargebee-setting.service.ts index 6506e8b7cc..d2696eb1ba 100644 --- a/packages/server-core/src/setting/chargebee-setting/chargebee-setting.service.ts +++ b/packages/server-core/src/setting/chargebee-setting/chargebee-setting.service.ts @@ -4,7 +4,7 @@ import { ChargebeeSetting } from './chargebee-setting.class' import hooks from './chargebee-setting.hooks' import createModel from './chargebee-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'chargebee-setting': ChargebeeSetting } diff --git a/packages/server-core/src/setting/client-setting/client-setting.class.ts b/packages/server-core/src/setting/client-setting/client-setting.class.ts index 2733fffa5c..60eac5b6f3 100644 --- a/packages/server-core/src/setting/client-setting/client-setting.class.ts +++ b/packages/server-core/src/setting/client-setting/client-setting.class.ts @@ -2,7 +2,7 @@ import { Id, NullableId, Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import path from 'path' -import { ClientSetting as ClientSettingInterface } from '@xrengine/common/src/interfaces/ClientSetting' +import { ClientSetting as ClientSettingInterface } from '@etherealengine/common/src/interfaces/ClientSetting' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/setting/client-setting/client-setting.model.ts b/packages/server-core/src/setting/client-setting/client-setting.model.ts index ba66d4ace0..26fd3b1275 100644 --- a/packages/server-core/src/setting/client-setting/client-setting.model.ts +++ b/packages/server-core/src/setting/client-setting/client-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ClientSettingInterface } from '@xrengine/common/src/dbmodels/ClientSetting' +import { ClientSettingInterface } from '@etherealengine/common/src/dbmodels/ClientSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/client-setting/client-setting.seed.ts b/packages/server-core/src/setting/client-setting/client-setting.seed.ts index 76d83ef164..646a9a4c18 100644 --- a/packages/server-core/src/setting/client-setting/client-setting.seed.ts +++ b/packages/server-core/src/setting/client-setting/client-setting.seed.ts @@ -1,4 +1,4 @@ -import { defaultThemeModes, defaultThemeSettings } from '@xrengine/common/src/constants/DefaultThemeSettings' +import { defaultThemeModes, defaultThemeSettings } from '@etherealengine/common/src/constants/DefaultThemeSettings' export const clientSeed = { path: 'client-setting', @@ -25,7 +25,7 @@ export const clientSeed = { appDescription: 'FREE, OPEN, & INTEROPERABLE IMMERSIVE WEB TECHNOLOGY', appSocialLinks: JSON.stringify([ { icon: 'static/discord.svg', link: 'https://discord.gg/xrf' }, - { icon: 'static/github.svg', link: 'https://github.com/XRFoundation' } + { icon: 'static/github.svg', link: 'https://github.com/etherealengine' } ]), themeSettings: JSON.stringify(defaultThemeSettings), themeModes: JSON.stringify(defaultThemeModes), diff --git a/packages/server-core/src/setting/client-setting/client-setting.service.ts b/packages/server-core/src/setting/client-setting/client-setting.service.ts index 35b20fa96e..fd80f277ce 100644 --- a/packages/server-core/src/setting/client-setting/client-setting.service.ts +++ b/packages/server-core/src/setting/client-setting/client-setting.service.ts @@ -4,7 +4,7 @@ import { ClientSetting } from './client-setting.class' import hooks from './client-setting.hooks' import createModel from './client-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'client-setting': ClientSetting } diff --git a/packages/server-core/src/setting/coil-setting/coil-setting.class.ts b/packages/server-core/src/setting/coil-setting/coil-setting.class.ts index d3e1449f16..a336a26d5f 100644 --- a/packages/server-core/src/setting/coil-setting/coil-setting.class.ts +++ b/packages/server-core/src/setting/coil-setting/coil-setting.class.ts @@ -1,8 +1,8 @@ import { Id, Paginated } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { CoilSetting as CoilSettingDataType } from '@xrengine/common/src/interfaces/CoilSetting' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { CoilSetting as CoilSettingDataType } from '@etherealengine/common/src/interfaces/CoilSetting' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import { UserParams } from '../../user/user/user.class' diff --git a/packages/server-core/src/setting/coil-setting/coil-setting.model.ts b/packages/server-core/src/setting/coil-setting/coil-setting.model.ts index c5dce5f6ee..050f311fc2 100644 --- a/packages/server-core/src/setting/coil-setting/coil-setting.model.ts +++ b/packages/server-core/src/setting/coil-setting/coil-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { CoilSettingInterface } from '@xrengine/common/src/dbmodels/CoilSetting' +import { CoilSettingInterface } from '@etherealengine/common/src/dbmodels/CoilSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/coil-setting/coil-setting.service.ts b/packages/server-core/src/setting/coil-setting/coil-setting.service.ts index 27e58ba6f0..ef690c09bf 100644 --- a/packages/server-core/src/setting/coil-setting/coil-setting.service.ts +++ b/packages/server-core/src/setting/coil-setting/coil-setting.service.ts @@ -4,7 +4,7 @@ import { CoilSetting } from './coil-setting.class' import hooks from './coil-setting.hooks' import createModel from './coil-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'coil-setting': CoilSetting } diff --git a/packages/server-core/src/setting/email-setting/email-setting.class.ts b/packages/server-core/src/setting/email-setting/email-setting.class.ts index bb8d8d6705..70f855ff6b 100644 --- a/packages/server-core/src/setting/email-setting/email-setting.class.ts +++ b/packages/server-core/src/setting/email-setting/email-setting.class.ts @@ -1,7 +1,7 @@ import { NullableId, Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { EmailSetting as EmailSettingInterface } from '@xrengine/common/src/interfaces/EmailSetting' +import { EmailSetting as EmailSettingInterface } from '@etherealengine/common/src/interfaces/EmailSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/email-setting/email-setting.model.ts b/packages/server-core/src/setting/email-setting/email-setting.model.ts index 0f01123b43..0df8cfca80 100644 --- a/packages/server-core/src/setting/email-setting/email-setting.model.ts +++ b/packages/server-core/src/setting/email-setting/email-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { EmailSettingInterface } from '@xrengine/common/src/dbmodels/EmailSetting' +import { EmailSettingInterface } from '@etherealengine/common/src/dbmodels/EmailSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/email-setting/email-setting.seed.ts b/packages/server-core/src/setting/email-setting/email-setting.seed.ts index f48504d2ec..cc1b62e267 100644 --- a/packages/server-core/src/setting/email-setting/email-setting.seed.ts +++ b/packages/server-core/src/setting/email-setting/email-setting.seed.ts @@ -15,10 +15,10 @@ export const emailSeed = { from: `${process.env.SMTP_FROM_NAME}` + ` <${process.env.SMTP_FROM_EMAIL}>` || 'test', subject: JSON.stringify({ // Subject of the Login Link email - login: 'XREngine login link', - friend: 'XREngine friend request', - group: 'XREngine group invitation', - party: 'XREngine party invitation' + login: 'Ethereal Engine login link', + friend: 'Ethereal Engine friend request', + group: 'Ethereal Engine group invitation', + party: 'Ethereal Engine party invitation' }), smsNameCharacterLimit: 20 } diff --git a/packages/server-core/src/setting/email-setting/email-setting.service.ts b/packages/server-core/src/setting/email-setting/email-setting.service.ts index cd2313f9de..a5bfa34e54 100644 --- a/packages/server-core/src/setting/email-setting/email-setting.service.ts +++ b/packages/server-core/src/setting/email-setting/email-setting.service.ts @@ -4,7 +4,7 @@ import { EmailSetting } from './email-setting.class' import hooks from './email-setting.hooks' import createModel from './email-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'email-setting': EmailSetting } diff --git a/packages/server-core/src/setting/instance-server-setting/instance-server-setting.class.ts b/packages/server-core/src/setting/instance-server-setting/instance-server-setting.class.ts index e8826e7737..dac93feb76 100644 --- a/packages/server-core/src/setting/instance-server-setting/instance-server-setting.class.ts +++ b/packages/server-core/src/setting/instance-server-setting/instance-server-setting.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { InstanceServerSetting as InstanceServerSettingInterface } from '@xrengine/common/src/interfaces/InstanceServerSetting' +import { InstanceServerSetting as InstanceServerSettingInterface } from '@etherealengine/common/src/interfaces/InstanceServerSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/instance-server-setting/instance-server-setting.model.ts b/packages/server-core/src/setting/instance-server-setting/instance-server-setting.model.ts index e7f5b21a55..e23731aa3a 100644 --- a/packages/server-core/src/setting/instance-server-setting/instance-server-setting.model.ts +++ b/packages/server-core/src/setting/instance-server-setting/instance-server-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { InstanceServerSettingInterface } from '@xrengine/common/src/dbmodels/InstanceServerSetting' +import { InstanceServerSettingInterface } from '@etherealengine/common/src/dbmodels/InstanceServerSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/instance-server-setting/instance-server-setting.service.ts b/packages/server-core/src/setting/instance-server-setting/instance-server-setting.service.ts index 7d4b853d5c..55d51ddea2 100644 --- a/packages/server-core/src/setting/instance-server-setting/instance-server-setting.service.ts +++ b/packages/server-core/src/setting/instance-server-setting/instance-server-setting.service.ts @@ -4,7 +4,7 @@ import { InstanceServerSetting } from './instance-server-setting.class' import hooks from './instance-server-setting.hooks' import createModel from './instance-server-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'instance-server-setting': InstanceServerSetting } diff --git a/packages/server-core/src/setting/project-setting/project-setting.service.ts b/packages/server-core/src/setting/project-setting/project-setting.service.ts index c98822801f..5e833e1a10 100644 --- a/packages/server-core/src/setting/project-setting/project-setting.service.ts +++ b/packages/server-core/src/setting/project-setting/project-setting.service.ts @@ -3,7 +3,7 @@ import { updateAppConfig } from '../../updateAppConfig' import { ProjectSetting } from './project-setting.class' import hooks from './project-setting.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'project-setting': ProjectSetting } diff --git a/packages/server-core/src/setting/redis-setting/redis-setting.class.ts b/packages/server-core/src/setting/redis-setting/redis-setting.class.ts index e0023f0870..4e9188278e 100644 --- a/packages/server-core/src/setting/redis-setting/redis-setting.class.ts +++ b/packages/server-core/src/setting/redis-setting/redis-setting.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { AdminRedisSetting as RedisSettingInterface } from '@xrengine/common/src/interfaces/AdminRedisSetting' +import { AdminRedisSetting as RedisSettingInterface } from '@etherealengine/common/src/interfaces/AdminRedisSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/redis-setting/redis-setting.model.ts b/packages/server-core/src/setting/redis-setting/redis-setting.model.ts index 274a2d8e7a..c2bc5d9be4 100644 --- a/packages/server-core/src/setting/redis-setting/redis-setting.model.ts +++ b/packages/server-core/src/setting/redis-setting/redis-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { RedisSettingInterface } from '@xrengine/common/src/dbmodels/RedisSetting' +import { RedisSettingInterface } from '@etherealengine/common/src/dbmodels/RedisSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/redis-setting/redis-setting.service.ts b/packages/server-core/src/setting/redis-setting/redis-setting.service.ts index 6bafba03e5..ba5d17c3f6 100644 --- a/packages/server-core/src/setting/redis-setting/redis-setting.service.ts +++ b/packages/server-core/src/setting/redis-setting/redis-setting.service.ts @@ -4,7 +4,7 @@ import { RedisSetting } from './redis-setting.class' import hooks from './redis-setting.hooks' import createModel from './redis-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'redis-setting': RedisSetting } diff --git a/packages/server-core/src/setting/seeder-config.ts b/packages/server-core/src/setting/seeder-config.ts index 88d7ac6fb9..85ada22528 100644 --- a/packages/server-core/src/setting/seeder-config.ts +++ b/packages/server-core/src/setting/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { authenticationSeed } from './authentication-setting/authentication.seed' import { awsSeed } from './aws-setting/aws-setting.seed' diff --git a/packages/server-core/src/setting/server-setting/server-setting.class.ts b/packages/server-core/src/setting/server-setting/server-setting.class.ts index bb70b865b2..eb315a484e 100644 --- a/packages/server-core/src/setting/server-setting/server-setting.class.ts +++ b/packages/server-core/src/setting/server-setting/server-setting.class.ts @@ -1,7 +1,7 @@ import { NullableId, Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { ServerSetting as ServerSettingInterface } from '@xrengine/common/src/interfaces/ServerSetting' +import { ServerSetting as ServerSettingInterface } from '@etherealengine/common/src/interfaces/ServerSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/server-setting/server-setting.model.ts b/packages/server-core/src/setting/server-setting/server-setting.model.ts index 56eb349c26..d6bf965aa4 100644 --- a/packages/server-core/src/setting/server-setting/server-setting.model.ts +++ b/packages/server-core/src/setting/server-setting/server-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ServerSettingInterface } from '@xrengine/common/src/dbmodels/ServerSetting' +import { ServerSettingInterface } from '@etherealengine/common/src/dbmodels/ServerSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/server-setting/server-setting.service.ts b/packages/server-core/src/setting/server-setting/server-setting.service.ts index 6f99531318..bb78fcb23c 100644 --- a/packages/server-core/src/setting/server-setting/server-setting.service.ts +++ b/packages/server-core/src/setting/server-setting/server-setting.service.ts @@ -4,7 +4,7 @@ import { ServerSetting } from './server-setting.class' import hooks from './server-setting.hooks' import createModel from './server-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'server-setting': ServerSetting } diff --git a/packages/server-core/src/setting/task-server-setting/task-server-setting.class.ts b/packages/server-core/src/setting/task-server-setting/task-server-setting.class.ts index ce2496ee39..aaf66ec905 100644 --- a/packages/server-core/src/setting/task-server-setting/task-server-setting.class.ts +++ b/packages/server-core/src/setting/task-server-setting/task-server-setting.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { TaskServerSetting as TaskServerSettingInterface } from '@xrengine/common/src/interfaces/TaskServerSetting' +import { TaskServerSetting as TaskServerSettingInterface } from '@etherealengine/common/src/interfaces/TaskServerSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/task-server-setting/task-server-setting.model.ts b/packages/server-core/src/setting/task-server-setting/task-server-setting.model.ts index 3f17e4e5da..753e447f3c 100644 --- a/packages/server-core/src/setting/task-server-setting/task-server-setting.model.ts +++ b/packages/server-core/src/setting/task-server-setting/task-server-setting.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { TaskServerSettingInterface } from '@xrengine/common/src/dbmodels/TaskServerSetting' +import { TaskServerSettingInterface } from '@etherealengine/common/src/dbmodels/TaskServerSetting' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/setting/task-server-setting/task-server-setting.service.ts b/packages/server-core/src/setting/task-server-setting/task-server-setting.service.ts index 5622f1408e..045ead2d9a 100644 --- a/packages/server-core/src/setting/task-server-setting/task-server-setting.service.ts +++ b/packages/server-core/src/setting/task-server-setting/task-server-setting.service.ts @@ -4,7 +4,7 @@ import { TaskServerSetting } from './task-server-setting.class' import hooks from './task-server-setting.hooks' import createModel from './task-server-setting.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'task-server-setting': TaskServerSetting } diff --git a/packages/server-core/src/social/channel-type/channel-type.class.ts b/packages/server-core/src/social/channel-type/channel-type.class.ts index cc67eedf9b..05d198ef2c 100755 --- a/packages/server-core/src/social/channel-type/channel-type.class.ts +++ b/packages/server-core/src/social/channel-type/channel-type.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { ChannelTypeInterface } from '@xrengine/common/src/dbmodels/ChannelType' +import { ChannelTypeInterface } from '@etherealengine/common/src/dbmodels/ChannelType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/channel-type/channel-type.model.ts b/packages/server-core/src/social/channel-type/channel-type.model.ts index 6ebb4aaa42..ad4b2afd9c 100755 --- a/packages/server-core/src/social/channel-type/channel-type.model.ts +++ b/packages/server-core/src/social/channel-type/channel-type.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ChannelTypeInterface } from '@xrengine/common/src/dbmodels/ChannelType' +import { ChannelTypeInterface } from '@etherealengine/common/src/dbmodels/ChannelType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/channel-type/channel-type.service.ts b/packages/server-core/src/social/channel-type/channel-type.service.ts index e5d99469b3..bf0979821f 100755 --- a/packages/server-core/src/social/channel-type/channel-type.service.ts +++ b/packages/server-core/src/social/channel-type/channel-type.service.ts @@ -4,7 +4,7 @@ import channelTypeDocs from './channel-type.docs' import hooks from './channel-type.hooks' import createModel from './channel-type.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'channel-type': ChannelType } diff --git a/packages/server-core/src/social/channel/channel.class.ts b/packages/server-core/src/social/channel/channel.class.ts index 23ff2f0e46..c3794df699 100755 --- a/packages/server-core/src/social/channel/channel.class.ts +++ b/packages/server-core/src/social/channel/channel.class.ts @@ -3,8 +3,8 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import _ from 'lodash' import { Op } from 'sequelize' -import { Channel as ChannelInterface } from '@xrengine/common/src/interfaces/Channel' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { Channel as ChannelInterface } from '@etherealengine/common/src/interfaces/Channel' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/social/channel/channel.hooks.ts b/packages/server-core/src/social/channel/channel.hooks.ts index acbf840d55..42cdc113d1 100755 --- a/packages/server-core/src/social/channel/channel.hooks.ts +++ b/packages/server-core/src/social/channel/channel.hooks.ts @@ -1,6 +1,6 @@ import { disallow } from 'feathers-hooks-common' -import addAssociations from '@xrengine/server-core/src/hooks/add-associations' +import addAssociations from '@etherealengine/server-core/src/hooks/add-associations' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/social/channel/channel.model.ts b/packages/server-core/src/social/channel/channel.model.ts index 77ce677034..5b0159c3ee 100755 --- a/packages/server-core/src/social/channel/channel.model.ts +++ b/packages/server-core/src/social/channel/channel.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { ChannelInterface } from '@xrengine/common/src/dbmodels/Channel' +import { ChannelInterface } from '@etherealengine/common/src/dbmodels/Channel' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/channel/channel.service.ts b/packages/server-core/src/social/channel/channel.service.ts index dd2d939811..5b480cbc67 100755 --- a/packages/server-core/src/social/channel/channel.service.ts +++ b/packages/server-core/src/social/channel/channel.service.ts @@ -8,7 +8,7 @@ import hooks from './channel.hooks' import createModel from './channel.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { channel: Channel } diff --git a/packages/server-core/src/social/group-user-rank/group-user-rank.class.ts b/packages/server-core/src/social/group-user-rank/group-user-rank.class.ts index cecda96bd2..865cabbc51 100755 --- a/packages/server-core/src/social/group-user-rank/group-user-rank.class.ts +++ b/packages/server-core/src/social/group-user-rank/group-user-rank.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { GroupUserRankInterface } from '@xrengine/common/src/dbmodels/GroupUserRank' +import { GroupUserRankInterface } from '@etherealengine/common/src/dbmodels/GroupUserRank' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/group-user-rank/group-user-rank.model.ts b/packages/server-core/src/social/group-user-rank/group-user-rank.model.ts index 4979420562..e67a75c2f1 100755 --- a/packages/server-core/src/social/group-user-rank/group-user-rank.model.ts +++ b/packages/server-core/src/social/group-user-rank/group-user-rank.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { GroupUserRankInterface } from '@xrengine/common/src/dbmodels/GroupUserRank' +import { GroupUserRankInterface } from '@etherealengine/common/src/dbmodels/GroupUserRank' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/group-user-rank/group-user-rank.service.ts b/packages/server-core/src/social/group-user-rank/group-user-rank.service.ts index d36893c83a..caf4b2dc24 100755 --- a/packages/server-core/src/social/group-user-rank/group-user-rank.service.ts +++ b/packages/server-core/src/social/group-user-rank/group-user-rank.service.ts @@ -4,7 +4,7 @@ import groupUserRankDocs from './group-user-rank.docs' import hooks from './group-user-rank.hooks' import createModel from './group-user-rank.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'group-user-rank': GroupUserRank } diff --git a/packages/server-core/src/social/group-user/group-user.class.ts b/packages/server-core/src/social/group-user/group-user.class.ts index e27a50b85b..c4827d9a0e 100755 --- a/packages/server-core/src/social/group-user/group-user.class.ts +++ b/packages/server-core/src/social/group-user/group-user.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { GroupUser as GroupUserInterface } from '@xrengine/common/src/interfaces/GroupUser' +import { GroupUser as GroupUserInterface } from '@etherealengine/common/src/interfaces/GroupUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/group-user/group-user.hooks.ts b/packages/server-core/src/social/group-user/group-user.hooks.ts index 9e26b389ad..915d9d54da 100755 --- a/packages/server-core/src/social/group-user/group-user.hooks.ts +++ b/packages/server-core/src/social/group-user/group-user.hooks.ts @@ -1,8 +1,8 @@ import { HookContext } from '@feathersjs/feathers' import { disallow, iff, isProvider } from 'feathers-hooks-common' -import groupPermissionAuthenticate from '@xrengine/server-core/src/hooks/group-permission-authenticate' -import groupUserPermissionAuthenticate from '@xrengine/server-core/src/hooks/group-user-permission-authenticate' +import groupPermissionAuthenticate from '@etherealengine/server-core/src/hooks/group-permission-authenticate' +import groupUserPermissionAuthenticate from '@etherealengine/server-core/src/hooks/group-user-permission-authenticate' import authenticate from '../../hooks/authenticate' import verifyScope from '../../hooks/verify-scope' diff --git a/packages/server-core/src/social/group-user/group-user.model.ts b/packages/server-core/src/social/group-user/group-user.model.ts index cf8f96628e..aacb8986e5 100755 --- a/packages/server-core/src/social/group-user/group-user.model.ts +++ b/packages/server-core/src/social/group-user/group-user.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { GroupUserInterface } from '@xrengine/common/src/dbmodels/GroupUser' +import { GroupUserInterface } from '@etherealengine/common/src/dbmodels/GroupUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/group-user/group-user.service.ts b/packages/server-core/src/social/group-user/group-user.service.ts index 8521006bf9..ffa359c269 100755 --- a/packages/server-core/src/social/group-user/group-user.service.ts +++ b/packages/server-core/src/social/group-user/group-user.service.ts @@ -5,7 +5,7 @@ import groupUserDocs from './group-user.docs' import hooks from './group-user.hooks' import createModel from './group-user.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'group-user': GroupUser } diff --git a/packages/server-core/src/social/group/group.class.ts b/packages/server-core/src/social/group/group.class.ts index a76961044f..c168c459ea 100755 --- a/packages/server-core/src/social/group/group.class.ts +++ b/packages/server-core/src/social/group/group.class.ts @@ -2,8 +2,8 @@ import { Paginated } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' -import { Group as GroupInterface } from '@xrengine/common/src/interfaces/Group' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { Group as GroupInterface } from '@etherealengine/common/src/interfaces/Group' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import { UserParams } from '../../user/user/user.class' diff --git a/packages/server-core/src/social/group/group.hooks.ts b/packages/server-core/src/social/group/group.hooks.ts index 70e19690ee..a0c118d699 100755 --- a/packages/server-core/src/social/group/group.hooks.ts +++ b/packages/server-core/src/social/group/group.hooks.ts @@ -1,9 +1,9 @@ import { HookContext } from '@feathersjs/feathers' import { disallow } from 'feathers-hooks-common' -import createGroupOwner from '@xrengine/server-core/src/hooks/create-group-owner' -import groupPermissionAuthenticate from '@xrengine/server-core/src/hooks/group-permission-authenticate' -import removeGroupUsers from '@xrengine/server-core/src/hooks/remove-group-users' +import createGroupOwner from '@etherealengine/server-core/src/hooks/create-group-owner' +import groupPermissionAuthenticate from '@etherealengine/server-core/src/hooks/group-permission-authenticate' +import removeGroupUsers from '@etherealengine/server-core/src/hooks/remove-group-users' import authenticate from '../../hooks/authenticate' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/social/group/group.model.ts b/packages/server-core/src/social/group/group.model.ts index 0b8ed51b8b..573a5a52bc 100755 --- a/packages/server-core/src/social/group/group.model.ts +++ b/packages/server-core/src/social/group/group.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { GroupInterface } from '@xrengine/common/src/dbmodels/Group' +import { GroupInterface } from '@etherealengine/common/src/dbmodels/Group' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/group/group.service.ts b/packages/server-core/src/social/group/group.service.ts index 82a3f9fc15..6f602d2b48 100755 --- a/packages/server-core/src/social/group/group.service.ts +++ b/packages/server-core/src/social/group/group.service.ts @@ -4,7 +4,7 @@ import groupDocs from './group.docs' import hooks from './group.hooks' import createModel from './group.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { group: Group } diff --git a/packages/server-core/src/social/invite-type/invite-type.class.ts b/packages/server-core/src/social/invite-type/invite-type.class.ts index 90805081b4..f61a5e0e6e 100755 --- a/packages/server-core/src/social/invite-type/invite-type.class.ts +++ b/packages/server-core/src/social/invite-type/invite-type.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { InviteType as InviteTypeInterface } from '@xrengine/common/src/interfaces/InviteType' +import { InviteType as InviteTypeInterface } from '@etherealengine/common/src/interfaces/InviteType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/invite-type/invite-type.model.ts b/packages/server-core/src/social/invite-type/invite-type.model.ts index 8b55d8dda5..4ae858c77d 100755 --- a/packages/server-core/src/social/invite-type/invite-type.model.ts +++ b/packages/server-core/src/social/invite-type/invite-type.model.ts @@ -2,7 +2,7 @@ // for more of what you can do here. import { DataTypes, Model, Sequelize } from 'sequelize' -import { InviteTypeInterface } from '@xrengine/common/src/dbmodels/InviteType' +import { InviteTypeInterface } from '@etherealengine/common/src/dbmodels/InviteType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/invite-type/invite-type.service.ts b/packages/server-core/src/social/invite-type/invite-type.service.ts index 70b0f53366..e03fbaba36 100755 --- a/packages/server-core/src/social/invite-type/invite-type.service.ts +++ b/packages/server-core/src/social/invite-type/invite-type.service.ts @@ -6,7 +6,7 @@ import hooks from './invite-type.hooks' import createModel from './invite-type.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'invite-type': InviteType } diff --git a/packages/server-core/src/social/invite/invite.class.ts b/packages/server-core/src/social/invite/invite.class.ts index b6f27074f0..64c3e2dfd1 100755 --- a/packages/server-core/src/social/invite/invite.class.ts +++ b/packages/server-core/src/social/invite/invite.class.ts @@ -4,9 +4,9 @@ import crypto from 'crypto' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import Sequelize, { Op } from 'sequelize' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' -import { Invite as InviteType } from '@xrengine/common/src/interfaces/Invite' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' +import { Invite as InviteType } from '@etherealengine/common/src/interfaces/Invite' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import { sendInvite } from '../../hooks/send-invite' diff --git a/packages/server-core/src/social/invite/invite.hooks.ts b/packages/server-core/src/social/invite/invite.hooks.ts index 11e49d353f..c2e54ee77e 100755 --- a/packages/server-core/src/social/invite/invite.hooks.ts +++ b/packages/server-core/src/social/invite/invite.hooks.ts @@ -1,9 +1,9 @@ import { disallow } from 'feathers-hooks-common' import { iff, isProvider } from 'feathers-hooks-common' -import inviteRemoveAuthenticate from '@xrengine/server-core/src/hooks/invite-remove-authenticate' -import attachOwnerIdInBody from '@xrengine/server-core/src/hooks/set-loggedin-user-in-body' -import attachOwnerIdInQuery from '@xrengine/server-core/src/hooks/set-loggedin-user-in-query' +import inviteRemoveAuthenticate from '@etherealengine/server-core/src/hooks/invite-remove-authenticate' +import attachOwnerIdInBody from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-body' +import attachOwnerIdInQuery from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-query' import addAssociations from '../../hooks/add-associations' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/social/invite/invite.model.ts b/packages/server-core/src/social/invite/invite.model.ts index b74e1b4ea3..bbbc229193 100755 --- a/packages/server-core/src/social/invite/invite.model.ts +++ b/packages/server-core/src/social/invite/invite.model.ts @@ -2,7 +2,7 @@ // for more of what you can do here. import { DataTypes, Model, Sequelize } from 'sequelize' -import { InviteInterface } from '@xrengine/common/src/dbmodels/Invite' +import { InviteInterface } from '@etherealengine/common/src/dbmodels/Invite' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/invite/invite.service.ts b/packages/server-core/src/social/invite/invite.service.ts index 868eb2e0b6..c53c369ef7 100755 --- a/packages/server-core/src/social/invite/invite.service.ts +++ b/packages/server-core/src/social/invite/invite.service.ts @@ -8,7 +8,7 @@ import hooks from './invite.hooks' import createModel from './invite.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { invite: Invite } diff --git a/packages/server-core/src/social/invite/invite.test.ts b/packages/server-core/src/social/invite/invite.test.ts index 014b06a99d..6d3844fc5a 100755 --- a/packages/server-core/src/social/invite/invite.test.ts +++ b/packages/server-core/src/social/invite/invite.test.ts @@ -23,7 +23,7 @@ describe('invite service', () => { // // // Create test user // const type = 'password' - // const token = `${v1()}@xrengine.io` + // const token = `${v1()}@etherealengine.io` // const password = 'test@123' // // user = await app.service('identity-provider').create( @@ -52,7 +52,7 @@ describe('invite service', () => { // // it('should create an invite with friend', async () => { // const inviteType = 'friend' - // const token = `${v1()}@xrengine.io` + // const token = `${v1()}@etherealengine.io` // const identityProviderType = 'email' // // const item = (await app.service('invite').create({ @@ -74,7 +74,7 @@ describe('invite service', () => { // // it('should create an invite with group', async () => { // const inviteType = 'group' - // const token = `${v1()}@xrengine.io` + // const token = `${v1()}@etherealengine.io` // const identityProviderType = 'email' // // const item = (await app.service('invite').create({ @@ -96,7 +96,7 @@ describe('invite service', () => { // // it('should create an invite with party', async () => { // const inviteType = 'party' - // const token = `${v1()}@xrengine.io` + // const token = `${v1()}@etherealengine.io` // const identityProviderType = 'email' // // const item = (await app.service('invite').create({ diff --git a/packages/server-core/src/social/location-admin/location-admin.class.ts b/packages/server-core/src/social/location-admin/location-admin.class.ts index 7c1cfdf65d..5da70c3cd6 100755 --- a/packages/server-core/src/social/location-admin/location-admin.class.ts +++ b/packages/server-core/src/social/location-admin/location-admin.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { LocationAdmin as LocationAdminInterface } from '@xrengine/common/src/interfaces/LocationAdmin' +import { LocationAdmin as LocationAdminInterface } from '@etherealengine/common/src/interfaces/LocationAdmin' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-admin/location-admin.hooks.ts b/packages/server-core/src/social/location-admin/location-admin.hooks.ts index 4e870f5148..e6c917e960 100755 --- a/packages/server-core/src/social/location-admin/location-admin.hooks.ts +++ b/packages/server-core/src/social/location-admin/location-admin.hooks.ts @@ -1,6 +1,6 @@ import { disallow, iff, isProvider } from 'feathers-hooks-common' -import attachOwnerIdInQuery from '@xrengine/server-core/src/hooks/set-loggedin-user-in-query' +import attachOwnerIdInQuery from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-query' import authenticate from '../../hooks/authenticate' import verifyScope from '../../hooks/verify-scope' diff --git a/packages/server-core/src/social/location-admin/location-admin.model.ts b/packages/server-core/src/social/location-admin/location-admin.model.ts index 9f33abc996..e93aa75c5f 100755 --- a/packages/server-core/src/social/location-admin/location-admin.model.ts +++ b/packages/server-core/src/social/location-admin/location-admin.model.ts @@ -3,7 +3,7 @@ import { DataTypes, Model, Sequelize } from 'sequelize' import { HookReturn } from 'sequelize/types/hooks' -import { LocationAdminInterface } from '@xrengine/common/src/dbmodels/LocationAdmin' +import { LocationAdminInterface } from '@etherealengine/common/src/dbmodels/LocationAdmin' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-admin/location-admin.service.ts b/packages/server-core/src/social/location-admin/location-admin.service.ts index 0d3911a838..d1006ea7b2 100755 --- a/packages/server-core/src/social/location-admin/location-admin.service.ts +++ b/packages/server-core/src/social/location-admin/location-admin.service.ts @@ -6,7 +6,7 @@ import hooks from './location-admin.hooks' import createModel from './location-admin.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'location-admin': LocationAdmin } diff --git a/packages/server-core/src/social/location-authorized-user/location-authorized-user.class.ts b/packages/server-core/src/social/location-authorized-user/location-authorized-user.class.ts index d0e4d568b8..259e18a323 100755 --- a/packages/server-core/src/social/location-authorized-user/location-authorized-user.class.ts +++ b/packages/server-core/src/social/location-authorized-user/location-authorized-user.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { LocationAuthorizedUser as LocationAuthorizedUserInterface } from '@xrengine/common/src/interfaces/LocationAuthorizedUser' +import { LocationAuthorizedUser as LocationAuthorizedUserInterface } from '@etherealengine/common/src/interfaces/LocationAuthorizedUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-authorized-user/location-authorized-user.hooks.ts b/packages/server-core/src/social/location-authorized-user/location-authorized-user.hooks.ts index 78af4d4b26..9c861face8 100755 --- a/packages/server-core/src/social/location-authorized-user/location-authorized-user.hooks.ts +++ b/packages/server-core/src/social/location-authorized-user/location-authorized-user.hooks.ts @@ -1,6 +1,6 @@ import { disallow, iff, isProvider } from 'feathers-hooks-common' -import attachOwnerIdInQuery from '@xrengine/server-core/src/hooks/set-loggedin-user-in-query' +import attachOwnerIdInQuery from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-query' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/social/location-authorized-user/location-authorized-user.model.ts b/packages/server-core/src/social/location-authorized-user/location-authorized-user.model.ts index c4696ea21c..746a1c4c87 100755 --- a/packages/server-core/src/social/location-authorized-user/location-authorized-user.model.ts +++ b/packages/server-core/src/social/location-authorized-user/location-authorized-user.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { LocationAuthorizedUserInterface } from '@xrengine/common/src/dbmodels/LocationAuthorizedUser' +import { LocationAuthorizedUserInterface } from '@etherealengine/common/src/dbmodels/LocationAuthorizedUser' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-authorized-user/location-authorized-user.service.ts b/packages/server-core/src/social/location-authorized-user/location-authorized-user.service.ts index 4d58a3a050..9c8ae4457b 100755 --- a/packages/server-core/src/social/location-authorized-user/location-authorized-user.service.ts +++ b/packages/server-core/src/social/location-authorized-user/location-authorized-user.service.ts @@ -6,7 +6,7 @@ import hooks from './location-authorized-user.hooks' import createModel from './location-authorized-user.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'location-authorized-user': LocationAuthorizedUser } diff --git a/packages/server-core/src/social/location-ban/location-ban.class.ts b/packages/server-core/src/social/location-ban/location-ban.class.ts index 11cf4d77fe..19442e61a6 100755 --- a/packages/server-core/src/social/location-ban/location-ban.class.ts +++ b/packages/server-core/src/social/location-ban/location-ban.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { LocationBan as LocationBanInterface } from '@xrengine/common/src/interfaces/LocationBan' +import { LocationBan as LocationBanInterface } from '@etherealengine/common/src/interfaces/LocationBan' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-ban/location-ban.model.ts b/packages/server-core/src/social/location-ban/location-ban.model.ts index 9aaf71c769..e54df87395 100755 --- a/packages/server-core/src/social/location-ban/location-ban.model.ts +++ b/packages/server-core/src/social/location-ban/location-ban.model.ts @@ -3,7 +3,7 @@ import { DataTypes, Model, Sequelize } from 'sequelize' import { HookReturn } from 'sequelize/types/hooks' -import { LocationBanInterface } from '@xrengine/common/src/dbmodels/LocationBan' +import { LocationBanInterface } from '@etherealengine/common/src/dbmodels/LocationBan' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-ban/location-ban.service.ts b/packages/server-core/src/social/location-ban/location-ban.service.ts index f0731b4fe9..13b123be14 100755 --- a/packages/server-core/src/social/location-ban/location-ban.service.ts +++ b/packages/server-core/src/social/location-ban/location-ban.service.ts @@ -7,7 +7,7 @@ import hooks from './location-ban.hooks' import createModel from './location-ban.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'location-ban': LocationBan } diff --git a/packages/server-core/src/social/location-settings/location-settings.class.ts b/packages/server-core/src/social/location-settings/location-settings.class.ts index 376105d825..38a8ba56eb 100755 --- a/packages/server-core/src/social/location-settings/location-settings.class.ts +++ b/packages/server-core/src/social/location-settings/location-settings.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { LocationSettings as LocationSettingsInterface } from '@xrengine/common/src/interfaces/LocationSettings' +import { LocationSettings as LocationSettingsInterface } from '@etherealengine/common/src/interfaces/LocationSettings' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-settings/location-settings.model.ts b/packages/server-core/src/social/location-settings/location-settings.model.ts index e02215734c..12f3963d5d 100755 --- a/packages/server-core/src/social/location-settings/location-settings.model.ts +++ b/packages/server-core/src/social/location-settings/location-settings.model.ts @@ -3,7 +3,7 @@ import { DataTypes, Model, Sequelize } from 'sequelize' import { HookReturn } from 'sequelize/types/hooks' -import { LocationSettingsInterface } from '@xrengine/common/src/dbmodels/LocationSettings' +import { LocationSettingsInterface } from '@etherealengine/common/src/dbmodels/LocationSettings' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-settings/location-settings.service.ts b/packages/server-core/src/social/location-settings/location-settings.service.ts index 5261cd8f1c..828d314fcd 100755 --- a/packages/server-core/src/social/location-settings/location-settings.service.ts +++ b/packages/server-core/src/social/location-settings/location-settings.service.ts @@ -6,7 +6,7 @@ import hooks from './location-settings.hooks' import createModel from './location-settings.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'location-settings': LocationSettings } diff --git a/packages/server-core/src/social/location-type/location-type.class.ts b/packages/server-core/src/social/location-type/location-type.class.ts index e3e226783c..6fd95fb3c0 100755 --- a/packages/server-core/src/social/location-type/location-type.class.ts +++ b/packages/server-core/src/social/location-type/location-type.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { LocationType as LocationTypeInterface } from '@xrengine/common/src/interfaces/LocationType' +import { LocationType as LocationTypeInterface } from '@etherealengine/common/src/interfaces/LocationType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-type/location-type.model.ts b/packages/server-core/src/social/location-type/location-type.model.ts index 6b7a931a1c..72605124d7 100755 --- a/packages/server-core/src/social/location-type/location-type.model.ts +++ b/packages/server-core/src/social/location-type/location-type.model.ts @@ -3,7 +3,7 @@ import { DataTypes, Model, Sequelize } from 'sequelize' import { HookReturn } from 'sequelize/types/hooks' -import { LocationTypeInterface } from '@xrengine/common/src/dbmodels/LocationType' +import { LocationTypeInterface } from '@etherealengine/common/src/dbmodels/LocationType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location-type/location-type.service.ts b/packages/server-core/src/social/location-type/location-type.service.ts index c0942cc531..92f7eb6c0d 100755 --- a/packages/server-core/src/social/location-type/location-type.service.ts +++ b/packages/server-core/src/social/location-type/location-type.service.ts @@ -6,7 +6,7 @@ import hooks from './location-type.hooks' import createModel from './location-type.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'location-type': LocationType } diff --git a/packages/server-core/src/social/location/location.class.ts b/packages/server-core/src/social/location/location.class.ts index fe1659f968..7042626399 100755 --- a/packages/server-core/src/social/location/location.class.ts +++ b/packages/server-core/src/social/location/location.class.ts @@ -3,8 +3,8 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import Sequelize, { Op } from 'sequelize' import slugify from 'slugify' -import { Location as LocationType } from '@xrengine/common/src/interfaces/Location' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { Location as LocationType } from '@etherealengine/common/src/interfaces/Location' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/social/location/location.hooks.ts b/packages/server-core/src/social/location/location.hooks.ts index f1c4100adc..6f69dfe767 100755 --- a/packages/server-core/src/social/location/location.hooks.ts +++ b/packages/server-core/src/social/location/location.hooks.ts @@ -1,7 +1,7 @@ import { iff, isProvider } from 'feathers-hooks-common' -import addAssociations from '@xrengine/server-core/src/hooks/add-associations' -import verifyScope from '@xrengine/server-core/src/hooks/verify-scope' +import addAssociations from '@etherealengine/server-core/src/hooks/add-associations' +import verifyScope from '@etherealengine/server-core/src/hooks/verify-scope' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/social/location/location.model.ts b/packages/server-core/src/social/location/location.model.ts index 806eb2f977..a329f5e86c 100755 --- a/packages/server-core/src/social/location/location.model.ts +++ b/packages/server-core/src/social/location/location.model.ts @@ -1,7 +1,7 @@ // A place in physical or virtual space, with many copies (instances) import { DataTypes, Model, Sequelize } from 'sequelize' -import { LocationInterface } from '@xrengine/common/src/dbmodels/Location' +import { LocationInterface } from '@etherealengine/common/src/dbmodels/Location' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/location/location.seed.ts b/packages/server-core/src/social/location/location.seed.ts index dd27df1814..35e068137c 100755 --- a/packages/server-core/src/social/location/location.seed.ts +++ b/packages/server-core/src/social/location/location.seed.ts @@ -1,4 +1,4 @@ -import { Location } from '@xrengine/common/src/interfaces/Location' +import { Location } from '@etherealengine/common/src/interfaces/Location' import { locationSettingsSeed } from '../location-settings/location-settings.seed' diff --git a/packages/server-core/src/social/location/location.service.ts b/packages/server-core/src/social/location/location.service.ts index 9d98ba691b..7b12e9282d 100755 --- a/packages/server-core/src/social/location/location.service.ts +++ b/packages/server-core/src/social/location/location.service.ts @@ -4,7 +4,7 @@ import locationDocs from './location.docs' import hooks from './location.hooks' import createModel from './location.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { location: Location } diff --git a/packages/server-core/src/social/message-status/message-status.class.ts b/packages/server-core/src/social/message-status/message-status.class.ts index 03a2a7bd54..53a36e8fd3 100755 --- a/packages/server-core/src/social/message-status/message-status.class.ts +++ b/packages/server-core/src/social/message-status/message-status.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { MessageStatus as MessageStatusDataType } from '@xrengine/common/src/interfaces/MessageStatus' +import { MessageStatus as MessageStatusDataType } from '@etherealengine/common/src/interfaces/MessageStatus' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/message-status/message-status.model.ts b/packages/server-core/src/social/message-status/message-status.model.ts index 946ea11849..1fda614cd6 100755 --- a/packages/server-core/src/social/message-status/message-status.model.ts +++ b/packages/server-core/src/social/message-status/message-status.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { MessageStatusInterface } from '@xrengine/common/src/dbmodels/MessageStatus' +import { MessageStatusInterface } from '@etherealengine/common/src/dbmodels/MessageStatus' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/message-status/message-status.service.ts b/packages/server-core/src/social/message-status/message-status.service.ts index 38367938c1..d0bf6aaa64 100755 --- a/packages/server-core/src/social/message-status/message-status.service.ts +++ b/packages/server-core/src/social/message-status/message-status.service.ts @@ -4,7 +4,7 @@ import messageStatusDocs from './message-status.docs' import hooks from './message-status.hooks' import createModel from './message-status.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'message-status': MessageStatus } diff --git a/packages/server-core/src/social/message/message.class.ts b/packages/server-core/src/social/message/message.class.ts index 07f38c0f71..2ae1abdc98 100755 --- a/packages/server-core/src/social/message/message.class.ts +++ b/packages/server-core/src/social/message/message.class.ts @@ -2,8 +2,8 @@ import { BadRequest } from '@feathersjs/errors' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' -import { Message as MessageInterface } from '@xrengine/common/src/interfaces/Message' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { Message as MessageInterface } from '@etherealengine/common/src/interfaces/Message' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/social/message/message.hooks.ts b/packages/server-core/src/social/message/message.hooks.ts index f46ba11ef1..6a113609e6 100755 --- a/packages/server-core/src/social/message/message.hooks.ts +++ b/packages/server-core/src/social/message/message.hooks.ts @@ -1,7 +1,7 @@ -import addAssociations from '@xrengine/server-core/src/hooks/add-associations' -import channelPermissionAuthenticate from '@xrengine/server-core/src/hooks/channel-permission-authenticate' -import messagePermissionAuthenticate from '@xrengine/server-core/src/hooks/message-permission-authenticate' -import removeMessageStatuses from '@xrengine/server-core/src/hooks/remove-message-statuses' +import addAssociations from '@etherealengine/server-core/src/hooks/add-associations' +import channelPermissionAuthenticate from '@etherealengine/server-core/src/hooks/channel-permission-authenticate' +import messagePermissionAuthenticate from '@etherealengine/server-core/src/hooks/message-permission-authenticate' +import removeMessageStatuses from '@etherealengine/server-core/src/hooks/remove-message-statuses' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/social/message/message.model.ts b/packages/server-core/src/social/message/message.model.ts index c42b87763c..a12e514267 100755 --- a/packages/server-core/src/social/message/message.model.ts +++ b/packages/server-core/src/social/message/message.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { MessageInterface } from '@xrengine/common/src/dbmodels/Message' +import { MessageInterface } from '@etherealengine/common/src/dbmodels/Message' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/social/message/message.service.ts b/packages/server-core/src/social/message/message.service.ts index 98603b617a..55f89ff7ec 100755 --- a/packages/server-core/src/social/message/message.service.ts +++ b/packages/server-core/src/social/message/message.service.ts @@ -1,4 +1,4 @@ -import { Message as MessageInterface } from '@xrengine/common/src/interfaces/Message' +import { Message as MessageInterface } from '@etherealengine/common/src/interfaces/Message' import { Application } from '../../../declarations' import { Message } from './message.class' @@ -6,7 +6,7 @@ import messageDocs from './message.docs' import hooks from './message.hooks' import createModel from './message.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { message: Message } diff --git a/packages/server-core/src/social/party-user/party-user.class.ts b/packages/server-core/src/social/party-user/party-user.class.ts index 1444f99642..d446c68efd 100755 --- a/packages/server-core/src/social/party-user/party-user.class.ts +++ b/packages/server-core/src/social/party-user/party-user.class.ts @@ -2,8 +2,8 @@ import { Params } from '@feathersjs/feathers/lib' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' -import { PartyUser as PartyUserDataType } from '@xrengine/common/src/interfaces/PartyUser' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { PartyUser as PartyUserDataType } from '@etherealengine/common/src/interfaces/PartyUser' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/social/party-user/party-user.model.ts b/packages/server-core/src/social/party-user/party-user.model.ts index b9650e9afe..cc244c0484 100755 --- a/packages/server-core/src/social/party-user/party-user.model.ts +++ b/packages/server-core/src/social/party-user/party-user.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, ModelStatic, Sequelize } from 'sequelize' -import { PartyUserInterface } from '@xrengine/common/src/dbmodels/PartyUser' +import { PartyUserInterface } from '@etherealengine/common/src/dbmodels/PartyUser' export type PartyUserModel = Model> export type PartyUserModelStatic = ModelStatic diff --git a/packages/server-core/src/social/party-user/party-user.service.ts b/packages/server-core/src/social/party-user/party-user.service.ts index 0f96e193cb..1d37e2527e 100755 --- a/packages/server-core/src/social/party-user/party-user.service.ts +++ b/packages/server-core/src/social/party-user/party-user.service.ts @@ -9,7 +9,7 @@ import partyUserDocs from './party-user.docs' import hooks from './party-user.hooks' import createModel from './party-user.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'party-user': PartyUser } diff --git a/packages/server-core/src/social/party/party.class.ts b/packages/server-core/src/social/party/party.class.ts index c7a4ff5403..aa0ddd37ab 100755 --- a/packages/server-core/src/social/party/party.class.ts +++ b/packages/server-core/src/social/party/party.class.ts @@ -3,8 +3,8 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' import { Sequelize } from 'sequelize' -import { Party as PartyDataType } from '@xrengine/common/src/interfaces/Party' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { Party as PartyDataType } from '@etherealengine/common/src/interfaces/Party' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/social/party/party.model.ts b/packages/server-core/src/social/party/party.model.ts index b91fb25bbc..551742ded1 100755 --- a/packages/server-core/src/social/party/party.model.ts +++ b/packages/server-core/src/social/party/party.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, ModelStatic, Sequelize } from 'sequelize' -import { PartyInterface } from '@xrengine/common/src/dbmodels/Party' +import { PartyInterface } from '@etherealengine/common/src/dbmodels/Party' export type PartyModel = Model> export type PartyModelStatic = ModelStatic diff --git a/packages/server-core/src/social/party/party.service.ts b/packages/server-core/src/social/party/party.service.ts index 2eb0e83da3..ac6ad244a0 100755 --- a/packages/server-core/src/social/party/party.service.ts +++ b/packages/server-core/src/social/party/party.service.ts @@ -1,4 +1,4 @@ -import { Party as PartyDataType } from '@xrengine/common/src/interfaces/Party' +import { Party as PartyDataType } from '@etherealengine/common/src/interfaces/Party' import { Application, ServerMode } from '../../../declarations' import logger from '../../ServerLogger' @@ -7,7 +7,7 @@ import partyDocs from './party.docs' import hooks from './party.hooks' import createModel from './party.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { party: Party } diff --git a/packages/server-core/src/social/party/party.test.ts b/packages/server-core/src/social/party/party.test.ts index cdd0eb308a..a262b76c91 100644 --- a/packages/server-core/src/social/party/party.test.ts +++ b/packages/server-core/src/social/party/party.test.ts @@ -2,8 +2,8 @@ import appRootPath from 'app-root-path' import assert from 'assert' import path from 'path' -import { Party } from '@xrengine/common/src/interfaces/Party' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { Party } from '@etherealengine/common/src/interfaces/Party' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import { createFeathersExpressApp } from '../../createApp' diff --git a/packages/server-core/src/social/seeder-config.ts b/packages/server-core/src/social/seeder-config.ts index b51c24f87b..8647b7b720 100755 --- a/packages/server-core/src/social/seeder-config.ts +++ b/packages/server-core/src/social/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { channelTypeSeed } from './channel-type/channel-type.seed' import { groupUserRankSeed } from './group-user-rank/group-user-rank.seed' diff --git a/packages/server-core/src/types/WebRtcTransportParams.ts b/packages/server-core/src/types/WebRtcTransportParams.ts index 879892d04e..69b9a99c9a 100755 --- a/packages/server-core/src/types/WebRtcTransportParams.ts +++ b/packages/server-core/src/types/WebRtcTransportParams.ts @@ -1,5 +1,5 @@ -import { ChannelType } from '@xrengine/common/src/interfaces/Channel' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' +import { ChannelType } from '@etherealengine/common/src/interfaces/Channel' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' // Types borrowed from Mediasoup diff --git a/packages/server-core/src/updateAppConfig.ts b/packages/server-core/src/updateAppConfig.ts index 39334d50fb..db138ee528 100644 --- a/packages/server-core/src/updateAppConfig.ts +++ b/packages/server-core/src/updateAppConfig.ts @@ -8,7 +8,7 @@ dotenv.config() const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql', diff --git a/packages/server-core/src/user/accept-invite/accept-invite.service.ts b/packages/server-core/src/user/accept-invite/accept-invite.service.ts index 1ac14af04e..b8dc0709a1 100755 --- a/packages/server-core/src/user/accept-invite/accept-invite.service.ts +++ b/packages/server-core/src/user/accept-invite/accept-invite.service.ts @@ -8,7 +8,7 @@ import hooks from './accept-invite.hooks' /** * accept invite service */ -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'a-i': AcceptInvite } diff --git a/packages/server-core/src/user/auth-management/auth-management.hooks.ts b/packages/server-core/src/user/auth-management/auth-management.hooks.ts index e9626a7798..cef77c6ac5 100755 --- a/packages/server-core/src/user/auth-management/auth-management.hooks.ts +++ b/packages/server-core/src/user/auth-management/auth-management.hooks.ts @@ -1,6 +1,6 @@ import { disallow, iff } from 'feathers-hooks-common' -import isAction from '@xrengine/server-core/src/hooks/is-action' +import isAction from '@etherealengine/server-core/src/hooks/is-action' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/user/auth-management/auth-management.service.ts b/packages/server-core/src/user/auth-management/auth-management.service.ts index fe4e6045e9..b814edd0d5 100755 --- a/packages/server-core/src/user/auth-management/auth-management.service.ts +++ b/packages/server-core/src/user/auth-management/auth-management.service.ts @@ -7,7 +7,7 @@ import notifier from './auth-management.notifier' /** * A function which register service for auth management */ -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { authManagement: InstanceType> } diff --git a/packages/server-core/src/user/authentication.ts b/packages/server-core/src/user/authentication.ts index e5a8452b29..93034c2044 100755 --- a/packages/server-core/src/user/authentication.ts +++ b/packages/server-core/src/user/authentication.ts @@ -11,7 +11,7 @@ import LinkedInStrategy from './strategies/linkedin' import { MyLocalStrategy } from './strategies/local' import TwitterStrategy from './strategies/twitter' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { authentication: AuthenticationService } diff --git a/packages/server-core/src/user/avatar/avatar-helper.ts b/packages/server-core/src/user/avatar/avatar-helper.ts index 1de5fc9933..798e69c4c2 100644 --- a/packages/server-core/src/user/avatar/avatar-helper.ts +++ b/packages/server-core/src/user/avatar/avatar-helper.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' -import { CommonKnownContentTypes } from '@xrengine/common/src/utils/CommonKnownContentTypes' +import { CommonKnownContentTypes } from '@etherealengine/common/src/utils/CommonKnownContentTypes' import { Application } from '../../../declarations' import { addGenericAssetToS3AndStaticResources } from '../../media/upload-asset/upload-asset.service' diff --git a/packages/server-core/src/user/avatar/avatar.class.ts b/packages/server-core/src/user/avatar/avatar.class.ts index eef181ac4e..3dcdb6b1db 100755 --- a/packages/server-core/src/user/avatar/avatar.class.ts +++ b/packages/server-core/src/user/avatar/avatar.class.ts @@ -2,7 +2,7 @@ import { Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' import { Application } from '../../../declarations' import { checkScope } from '../../hooks/verify-scope' diff --git a/packages/server-core/src/user/avatar/avatar.model.ts b/packages/server-core/src/user/avatar/avatar.model.ts index c5d898707c..b9ed4ac01c 100755 --- a/packages/server-core/src/user/avatar/avatar.model.ts +++ b/packages/server-core/src/user/avatar/avatar.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { AvatarInterface } from '@xrengine/common/src/dbmodels/AvatarResource' +import { AvatarInterface } from '@etherealengine/common/src/dbmodels/AvatarResource' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/avatar/avatar.service.ts b/packages/server-core/src/user/avatar/avatar.service.ts index 42dc8fa4ef..15dc4770cf 100755 --- a/packages/server-core/src/user/avatar/avatar.service.ts +++ b/packages/server-core/src/user/avatar/avatar.service.ts @@ -4,7 +4,7 @@ import avatarDocs from './avatar.docs' import hooks from './avatar.hooks' import createModel from './avatar.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { /** * Interface for users input */ diff --git a/packages/server-core/src/user/avatar/generateAvatarThumbnail.ts b/packages/server-core/src/user/avatar/generateAvatarThumbnail.ts index 359cb81a2c..af241a6024 100644 --- a/packages/server-core/src/user/avatar/generateAvatarThumbnail.ts +++ b/packages/server-core/src/user/avatar/generateAvatarThumbnail.ts @@ -13,9 +13,9 @@ import { MAX_ALLOWED_TRIANGLES, THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH -} from '@xrengine/common/src/constants/AvatarConstants' -import { createGLTFLoader } from '@xrengine/engine/src/assets/functions/createGLTFLoader' -import { loadDRACODecoder } from '@xrengine/engine/src/assets/loaders/gltf/NodeDracoLoader' +} from '@etherealengine/common/src/constants/AvatarConstants' +import { createGLTFLoader } from '@etherealengine/engine/src/assets/functions/createGLTFLoader' +import { loadDRACODecoder } from '@etherealengine/engine/src/assets/loaders/gltf/NodeDracoLoader' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.class.ts b/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.class.ts index aafaf1873a..5be589b5cf 100755 --- a/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.class.ts +++ b/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.class.ts @@ -3,7 +3,7 @@ import { Paginated, Params, ServiceMethods } from '@feathersjs/feathers' import axios from 'axios' import { SequelizeServiceOptions } from 'feathers-sequelize/types' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.service.ts b/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.service.ts index 43af5965c8..3aa7124eca 100755 --- a/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.service.ts +++ b/packages/server-core/src/user/discord-bot-auth/discord-bot-auth.service.ts @@ -2,7 +2,7 @@ import { Application } from '../../../declarations' import { DicscordBotAuth } from './discord-bot-auth.class' import hooks from './discord-bot-auth.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'discord-bot-auth': DicscordBotAuth } diff --git a/packages/server-core/src/user/email/email.service.ts b/packages/server-core/src/user/email/email.service.ts index 0ef5c4ecae..cf2e5b56b4 100755 --- a/packages/server-core/src/user/email/email.service.ts +++ b/packages/server-core/src/user/email/email.service.ts @@ -7,7 +7,7 @@ import { Email } from './email.class' import emailDocs from './email.docs' import hooks from './email.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { email: Email } diff --git a/packages/server-core/src/user/github-repo-access/github-repo-access.class.ts b/packages/server-core/src/user/github-repo-access/github-repo-access.class.ts index 967e86098b..9e8f28dafa 100755 --- a/packages/server-core/src/user/github-repo-access/github-repo-access.class.ts +++ b/packages/server-core/src/user/github-repo-access/github-repo-access.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { GithubRepoAccessInterface } from '@xrengine/common/src/dbmodels/GithubRepoAccess' +import { GithubRepoAccessInterface } from '@etherealengine/common/src/dbmodels/GithubRepoAccess' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/github-repo-access/github-repo-access.model.ts b/packages/server-core/src/user/github-repo-access/github-repo-access.model.ts index 9383d3348a..7efa52a557 100755 --- a/packages/server-core/src/user/github-repo-access/github-repo-access.model.ts +++ b/packages/server-core/src/user/github-repo-access/github-repo-access.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { GithubRepoAccessInterface } from '@xrengine/common/src/dbmodels/GithubRepoAccess' +import { GithubRepoAccessInterface } from '@etherealengine/common/src/dbmodels/GithubRepoAccess' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/github-repo-access/github-repo-access.service.ts b/packages/server-core/src/user/github-repo-access/github-repo-access.service.ts index 2c47059478..0898de1806 100755 --- a/packages/server-core/src/user/github-repo-access/github-repo-access.service.ts +++ b/packages/server-core/src/user/github-repo-access/github-repo-access.service.ts @@ -3,8 +3,8 @@ import { Paginated } from '@feathersjs/feathers/lib' import crypto from 'crypto' import { iff, isProvider } from 'feathers-hooks-common' -import { ServerSettingInterface } from '@xrengine/common/src/dbmodels/ServerSetting' -import logger from '@xrengine/common/src/logger' +import { ServerSettingInterface } from '@etherealengine/common/src/dbmodels/ServerSetting' +import logger from '@etherealengine/common/src/logger' import { Application } from '../../../declarations' import authenticate from '../../hooks/authenticate' @@ -16,7 +16,7 @@ import githubRepoAccessDocs from './github-repo-access.docs' import hooks from './github-repo-access.hooks' import createModel from './github-repo-access.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'github-repo-access': any 'github-repo-access-webhook': any diff --git a/packages/server-core/src/user/identity-provider/identity-provider.class.ts b/packages/server-core/src/user/identity-provider/identity-provider.class.ts index 1826f04de1..5149d9be75 100755 --- a/packages/server-core/src/user/identity-provider/identity-provider.class.ts +++ b/packages/server-core/src/user/identity-provider/identity-provider.class.ts @@ -4,10 +4,10 @@ import { random } from 'lodash' import { Sequelize } from 'sequelize' import { v1 as uuidv1 } from 'uuid' -import { isDev } from '@xrengine/common/src/config' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { isDev } from '@etherealengine/common/src/config' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import appConfig from '../../appconfig' diff --git a/packages/server-core/src/user/identity-provider/identity-provider.model.ts b/packages/server-core/src/user/identity-provider/identity-provider.model.ts index f8f18adb9d..382d951c60 100755 --- a/packages/server-core/src/user/identity-provider/identity-provider.model.ts +++ b/packages/server-core/src/user/identity-provider/identity-provider.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/identity-provider/identity-provider.service.ts b/packages/server-core/src/user/identity-provider/identity-provider.service.ts index f364f6f54f..ea53ecdfb0 100755 --- a/packages/server-core/src/user/identity-provider/identity-provider.service.ts +++ b/packages/server-core/src/user/identity-provider/identity-provider.service.ts @@ -1,6 +1,6 @@ import { Paginated } from '@feathersjs/feathers' -import { IdentityProviderInterface } from '@xrengine/common/src/dbmodels/IdentityProvider' +import { IdentityProviderInterface } from '@etherealengine/common/src/dbmodels/IdentityProvider' import { Application } from '../../../declarations' import authenticate from '../../hooks/authenticate' @@ -9,7 +9,7 @@ import identityProviderDocs from './identity-provider.docs' import hooks from './identity-provider.hooks' import createModel from './identity-provider.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'identity-provider': IdentityProvider 'generate-token': any diff --git a/packages/server-core/src/user/identity-provider/identity-provider.test.ts b/packages/server-core/src/user/identity-provider/identity-provider.test.ts index 049b79d98e..0f3a83e18b 100755 --- a/packages/server-core/src/user/identity-provider/identity-provider.test.ts +++ b/packages/server-core/src/user/identity-provider/identity-provider.test.ts @@ -38,7 +38,7 @@ describe('identity-provider service', () => { it('should create an identity provider for email', async () => { const type = 'email' - const token = `${v1()}@xrengine.io` + const token = `${v1()}@etherealengine.io` const item = await app.service('identity-provider').create( { @@ -56,7 +56,7 @@ describe('identity-provider service', () => { it('should create an identity provider for password', async () => { const type = 'password' - const token = `${v1()}@xrengine.io` + const token = `${v1()}@etherealengine.io` const password = 'test@123' const item = await app.service('identity-provider').create( diff --git a/packages/server-core/src/user/login-token/login-token.class.ts b/packages/server-core/src/user/login-token/login-token.class.ts index ad75b0f1c4..fa6868241f 100755 --- a/packages/server-core/src/user/login-token/login-token.class.ts +++ b/packages/server-core/src/user/login-token/login-token.class.ts @@ -2,7 +2,7 @@ import crypto from 'crypto' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import moment from 'moment' -import { LoginTokenInterface } from '@xrengine/common/src/dbmodels/LoginToken' +import { LoginTokenInterface } from '@etherealengine/common/src/dbmodels/LoginToken' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/login-token/login-token.model.ts b/packages/server-core/src/user/login-token/login-token.model.ts index 8ce21f0df7..776e711f82 100755 --- a/packages/server-core/src/user/login-token/login-token.model.ts +++ b/packages/server-core/src/user/login-token/login-token.model.ts @@ -2,7 +2,7 @@ // for more of what you can do here. import { DataTypes, Model, Sequelize } from 'sequelize' -import { LoginTokenInterface } from '@xrengine/common/src/dbmodels/LoginToken' +import { LoginTokenInterface } from '@etherealengine/common/src/dbmodels/LoginToken' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/login-token/login-token.service.ts b/packages/server-core/src/user/login-token/login-token.service.ts index 97fb4ecb11..dc41d08c00 100755 --- a/packages/server-core/src/user/login-token/login-token.service.ts +++ b/packages/server-core/src/user/login-token/login-token.service.ts @@ -6,7 +6,7 @@ import hooks from './login-token.hooks' import createModel from './login-token.model' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'login-token': LoginToken } diff --git a/packages/server-core/src/user/login/login.service.ts b/packages/server-core/src/user/login/login.service.ts index 644f7e5ffe..47ee711e7a 100755 --- a/packages/server-core/src/user/login/login.service.ts +++ b/packages/server-core/src/user/login/login.service.ts @@ -7,7 +7,7 @@ import loginDocs from './login.docs' import hooks from './login.hooks' // Add this service to the service type index -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { login: Login } diff --git a/packages/server-core/src/user/magic-link/magic-link.service.ts b/packages/server-core/src/user/magic-link/magic-link.service.ts index 46e1a665e6..13d7dc3da3 100755 --- a/packages/server-core/src/user/magic-link/magic-link.service.ts +++ b/packages/server-core/src/user/magic-link/magic-link.service.ts @@ -3,7 +3,7 @@ import { Magiclink } from './magic-link.class' import magicLinkDocs from './magic-link.docs' import hooks from './magic-link.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'magic-link': Magiclink } diff --git a/packages/server-core/src/user/seeder-config.ts b/packages/server-core/src/user/seeder-config.ts index 6db17a86c2..397ddd12e3 100755 --- a/packages/server-core/src/user/seeder-config.ts +++ b/packages/server-core/src/user/seeder-config.ts @@ -1,4 +1,4 @@ -import { ServicesSeedConfig } from '@xrengine/common/src/interfaces/ServicesSeedConfig' +import { ServicesSeedConfig } from '@etherealengine/common/src/interfaces/ServicesSeedConfig' import { userRelationshipTypeSeed } from './user-relationship-type/user-relationship-type.seed' diff --git a/packages/server-core/src/user/sms/sms.service.ts b/packages/server-core/src/user/sms/sms.service.ts index 28a5e0017c..e9a39a9001 100755 --- a/packages/server-core/src/user/sms/sms.service.ts +++ b/packages/server-core/src/user/sms/sms.service.ts @@ -3,7 +3,7 @@ import { Sms } from './sms.class' import smsDocs from './sms.docs' import hooks from './sms.hooks' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { sms: Sms } diff --git a/packages/server-core/src/user/strategies/discord.ts b/packages/server-core/src/user/strategies/discord.ts index 008c6ac814..780577c1fb 100755 --- a/packages/server-core/src/user/strategies/discord.ts +++ b/packages/server-core/src/user/strategies/discord.ts @@ -2,8 +2,8 @@ import { AuthenticationRequest } from '@feathersjs/authentication' import { Paginated, Params } from '@feathersjs/feathers' import { random } from 'lodash' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/strategies/facebook.ts b/packages/server-core/src/user/strategies/facebook.ts index 6124cc9ec1..f57428e422 100755 --- a/packages/server-core/src/user/strategies/facebook.ts +++ b/packages/server-core/src/user/strategies/facebook.ts @@ -2,8 +2,8 @@ import { AuthenticationRequest } from '@feathersjs/authentication' import { Paginated, Params } from '@feathersjs/feathers' import { random } from 'lodash' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/strategies/github.ts b/packages/server-core/src/user/strategies/github.ts index 2873a6a57a..74d5a74c9e 100755 --- a/packages/server-core/src/user/strategies/github.ts +++ b/packages/server-core/src/user/strategies/github.ts @@ -2,8 +2,8 @@ import { AuthenticationRequest } from '@feathersjs/authentication' import { Paginated, Params } from '@feathersjs/feathers' import { random } from 'lodash' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/strategies/google.ts b/packages/server-core/src/user/strategies/google.ts index af15ff3a40..178c538e51 100755 --- a/packages/server-core/src/user/strategies/google.ts +++ b/packages/server-core/src/user/strategies/google.ts @@ -2,8 +2,8 @@ import { AuthenticationRequest } from '@feathersjs/authentication' import { Paginated, Params } from '@feathersjs/feathers' import { random } from 'lodash' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/strategies/linkedin.ts b/packages/server-core/src/user/strategies/linkedin.ts index 36418d180d..0d410252e2 100755 --- a/packages/server-core/src/user/strategies/linkedin.ts +++ b/packages/server-core/src/user/strategies/linkedin.ts @@ -2,8 +2,8 @@ import { AuthenticationRequest } from '@feathersjs/authentication' import { Paginated, Params } from '@feathersjs/feathers' import { random } from 'lodash' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/strategies/twitter.ts b/packages/server-core/src/user/strategies/twitter.ts index b39015e0b5..b011a7b48b 100755 --- a/packages/server-core/src/user/strategies/twitter.ts +++ b/packages/server-core/src/user/strategies/twitter.ts @@ -2,8 +2,8 @@ import { AuthenticationRequest } from '@feathersjs/authentication' import { Paginated, Params } from '@feathersjs/feathers' import { random } from 'lodash' -import { AvatarInterface } from '@xrengine/common/src/interfaces/AvatarInterface' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/user-api-key/user-api-key.class.ts b/packages/server-core/src/user/user-api-key/user-api-key.class.ts index afa83cb980..04dceac126 100755 --- a/packages/server-core/src/user/user-api-key/user-api-key.class.ts +++ b/packages/server-core/src/user/user-api-key/user-api-key.class.ts @@ -2,8 +2,8 @@ import { NullableId } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { v1 } from 'uuid' -import { UserApiKeyInterface } from '@xrengine/common/src/dbmodels/UserApiKey' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserApiKeyInterface } from '@etherealengine/common/src/dbmodels/UserApiKey' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import { UserParams } from '../user/user.class' diff --git a/packages/server-core/src/user/user-api-key/user-api-key.model.ts b/packages/server-core/src/user/user-api-key/user-api-key.model.ts index 41e9e31cbb..c1c1325d7f 100755 --- a/packages/server-core/src/user/user-api-key/user-api-key.model.ts +++ b/packages/server-core/src/user/user-api-key/user-api-key.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { UserApiKeyInterface } from '@xrengine/common/src/dbmodels/UserApiKey' +import { UserApiKeyInterface } from '@etherealengine/common/src/dbmodels/UserApiKey' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/user-api-key/user-api-key.service.ts b/packages/server-core/src/user/user-api-key/user-api-key.service.ts index 15bcf6b308..bf669e89a3 100755 --- a/packages/server-core/src/user/user-api-key/user-api-key.service.ts +++ b/packages/server-core/src/user/user-api-key/user-api-key.service.ts @@ -4,7 +4,7 @@ import userDocs from './user-api-key.docs' import hooks from './user-api-key.hooks' import createModel from './user-api-key.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { /** * Interface for users input */ diff --git a/packages/server-core/src/user/user-relationship-type/user-relationship-type.class.ts b/packages/server-core/src/user/user-relationship-type/user-relationship-type.class.ts index d90dfa27de..21b5da3aea 100755 --- a/packages/server-core/src/user/user-relationship-type/user-relationship-type.class.ts +++ b/packages/server-core/src/user/user-relationship-type/user-relationship-type.class.ts @@ -1,6 +1,6 @@ import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { UserRelationshipTypeInterface } from '@xrengine/common/src/dbmodels/UserRelationshipType' +import { UserRelationshipTypeInterface } from '@etherealengine/common/src/dbmodels/UserRelationshipType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/user-relationship-type/user-relationship-type.model.ts b/packages/server-core/src/user/user-relationship-type/user-relationship-type.model.ts index de2c611b92..ab04842ebd 100755 --- a/packages/server-core/src/user/user-relationship-type/user-relationship-type.model.ts +++ b/packages/server-core/src/user/user-relationship-type/user-relationship-type.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { UserRelationshipTypeInterface } from '@xrengine/common/src/dbmodels/UserRelationshipType' +import { UserRelationshipTypeInterface } from '@etherealengine/common/src/dbmodels/UserRelationshipType' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/user-relationship-type/user-relationship-type.service.ts b/packages/server-core/src/user/user-relationship-type/user-relationship-type.service.ts index 5ca23f0a64..289926b0bb 100755 --- a/packages/server-core/src/user/user-relationship-type/user-relationship-type.service.ts +++ b/packages/server-core/src/user/user-relationship-type/user-relationship-type.service.ts @@ -4,7 +4,7 @@ import userRelationshipTypeDocs from './user-relationship-type.docs' import hooks from './user-relationship-type.hooks' import createModel from './user-relationship-type.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'user-relationship-type': UserRelationshipType } diff --git a/packages/server-core/src/user/user-relationship/user-relationship.class.ts b/packages/server-core/src/user/user-relationship/user-relationship.class.ts index 38d7d68cde..e252dc8ca7 100755 --- a/packages/server-core/src/user/user-relationship/user-relationship.class.ts +++ b/packages/server-core/src/user/user-relationship/user-relationship.class.ts @@ -2,7 +2,7 @@ import { Id, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Sequelize, Transaction } from 'sequelize' -import { UserRelationshipInterface } from '@xrengine/common/src/dbmodels/UserRelationship' +import { UserRelationshipInterface } from '@etherealengine/common/src/dbmodels/UserRelationship' import { Application } from '../../../declarations' import config from '../../appconfig' diff --git a/packages/server-core/src/user/user-relationship/user-relationship.model.ts b/packages/server-core/src/user/user-relationship/user-relationship.model.ts index fc365c1612..5b41f121c1 100755 --- a/packages/server-core/src/user/user-relationship/user-relationship.model.ts +++ b/packages/server-core/src/user/user-relationship/user-relationship.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { UserRelationshipInterface } from '@xrengine/common/src/dbmodels/UserRelationship' +import { UserRelationshipInterface } from '@etherealengine/common/src/dbmodels/UserRelationship' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/user-relationship/user-relationship.service.ts b/packages/server-core/src/user/user-relationship/user-relationship.service.ts index b245772980..8c8576cc31 100755 --- a/packages/server-core/src/user/user-relationship/user-relationship.service.ts +++ b/packages/server-core/src/user/user-relationship/user-relationship.service.ts @@ -1,6 +1,6 @@ import { Op } from 'sequelize' -import { UserRelationshipInterface } from '@xrengine/common/src/dbmodels/UserRelationship' +import { UserRelationshipInterface } from '@etherealengine/common/src/dbmodels/UserRelationship' import { Application } from '../../../declarations' import logger from '../../ServerLogger' @@ -9,7 +9,7 @@ import userRelationshipDocs from './user-relationship.docs' import hooks from './user-relationship.hooks' import createModel from './user-relationship.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'user-relationship': UserRelationship } diff --git a/packages/server-core/src/user/user-settings/user-settings.class.ts b/packages/server-core/src/user/user-settings/user-settings.class.ts index 794d6e687c..7007979558 100755 --- a/packages/server-core/src/user/user-settings/user-settings.class.ts +++ b/packages/server-core/src/user/user-settings/user-settings.class.ts @@ -1,7 +1,7 @@ import { Id, NullableId, Paginated, Params } from '@feathersjs/feathers' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' -import { UserSetting } from '@xrengine/common/src/interfaces/User' +import { UserSetting } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/user-settings/user-settings.hooks.ts b/packages/server-core/src/user/user-settings/user-settings.hooks.ts index 9f1188e8ba..6094538b5f 100755 --- a/packages/server-core/src/user/user-settings/user-settings.hooks.ts +++ b/packages/server-core/src/user/user-settings/user-settings.hooks.ts @@ -2,8 +2,8 @@ import { Forbidden } from '@feathersjs/errors' import { HookContext } from '@feathersjs/feathers' import { disallow, iff, isProvider } from 'feathers-hooks-common' -import attachOwnerId from '@xrengine/server-core/src/hooks/set-loggedin-user-in-body' -import attachOwnerIdInQuery from '@xrengine/server-core/src/hooks/set-loggedin-user-in-query' +import attachOwnerId from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-body' +import attachOwnerIdInQuery from '@etherealengine/server-core/src/hooks/set-loggedin-user-in-query' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/user/user-settings/user-settings.model.ts b/packages/server-core/src/user/user-settings/user-settings.model.ts index 91230aaa21..08c86893bd 100755 --- a/packages/server-core/src/user/user-settings/user-settings.model.ts +++ b/packages/server-core/src/user/user-settings/user-settings.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { UserSetting } from '@xrengine/common/src/interfaces/User' +import { UserSetting } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/user-settings/user-settings.service.ts b/packages/server-core/src/user/user-settings/user-settings.service.ts index f9f5576d55..9769377838 100755 --- a/packages/server-core/src/user/user-settings/user-settings.service.ts +++ b/packages/server-core/src/user/user-settings/user-settings.service.ts @@ -4,7 +4,7 @@ import userSettingsDocs from './user-settings.docs' import hooks from './user-settings.hooks' import createModel from './user-settings.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { interface ServiceTypes { 'user-settings': UserSettings } diff --git a/packages/server-core/src/user/user/user.class.ts b/packages/server-core/src/user/user/user.class.ts index 687dac611e..878d8b03ee 100755 --- a/packages/server-core/src/user/user/user.class.ts +++ b/packages/server-core/src/user/user/user.class.ts @@ -4,7 +4,7 @@ import { Paginated } from '@feathersjs/feathers/lib' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { Op } from 'sequelize' -import { CreateEditUser, UserInterface, UserScope } from '@xrengine/common/src/interfaces/User' +import { CreateEditUser, UserInterface, UserScope } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import logger from '../../ServerLogger' diff --git a/packages/server-core/src/user/user/user.hooks.ts b/packages/server-core/src/user/user/user.hooks.ts index c9b642b087..b0a802b1db 100755 --- a/packages/server-core/src/user/user/user.hooks.ts +++ b/packages/server-core/src/user/user/user.hooks.ts @@ -1,8 +1,8 @@ import { HookContext } from '@feathersjs/feathers' import { iff, isProvider } from 'feathers-hooks-common' -import { UserInterface } from '@xrengine/common/src/interfaces/User' -import addAssociations from '@xrengine/server-core/src/hooks/add-associations' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' +import addAssociations from '@etherealengine/server-core/src/hooks/add-associations' import addScopeToUser from '../../hooks/add-scope-to-user' import authenticate from '../../hooks/authenticate' diff --git a/packages/server-core/src/user/user/user.model.ts b/packages/server-core/src/user/user/user.model.ts index 325385878a..b8044d6e61 100755 --- a/packages/server-core/src/user/user/user.model.ts +++ b/packages/server-core/src/user/user/user.model.ts @@ -1,6 +1,6 @@ import { DataTypes, Model, Sequelize } from 'sequelize' -import { UserInterface } from '@xrengine/common/src/dbmodels/UserInterface' +import { UserInterface } from '@etherealengine/common/src/dbmodels/UserInterface' import { Application } from '../../../declarations' diff --git a/packages/server-core/src/user/user/user.service.ts b/packages/server-core/src/user/user/user.service.ts index b7454ed6e3..fc8fc4a1ce 100755 --- a/packages/server-core/src/user/user/user.service.ts +++ b/packages/server-core/src/user/user/user.service.ts @@ -1,6 +1,6 @@ import _ from 'lodash' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import config from '../../appconfig' @@ -10,7 +10,7 @@ import userDocs from './user.docs' import hooks from './user.hooks' import createModel from './user.model' -declare module '@xrengine/common/declarations' { +declare module '@etherealengine/common/declarations' { /** * Interface for users input */ diff --git a/packages/server-core/src/user/user/user.test.ts b/packages/server-core/src/user/user/user.test.ts index c2d668880a..bd48578d98 100755 --- a/packages/server-core/src/user/user/user.test.ts +++ b/packages/server-core/src/user/user/user.test.ts @@ -1,7 +1,7 @@ import assert from 'assert' import { v1 } from 'uuid' -import { UserInterface } from '@xrengine/common/src/interfaces/User' +import { UserInterface } from '@etherealengine/common/src/interfaces/User' import { Application } from '../../../declarations' import { createFeathersExpressApp } from '../../createApp' diff --git a/packages/server-core/src/util/make-initial-admin.ts b/packages/server-core/src/util/make-initial-admin.ts index ed781587fa..c84cb24145 100644 --- a/packages/server-core/src/util/make-initial-admin.ts +++ b/packages/server-core/src/util/make-initial-admin.ts @@ -1,4 +1,4 @@ -import { UserId } from '@xrengine/common/src/interfaces/UserId' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' import { Application } from '../../declarations' import { scopeTypeSeed } from '../scope/scope-type/scope-type.seed' diff --git a/packages/server-core/src/util/useSequilizeClient.ts b/packages/server-core/src/util/useSequilizeClient.ts index 0efa2159e4..bf62a287c2 100644 --- a/packages/server-core/src/util/useSequilizeClient.ts +++ b/packages/server-core/src/util/useSequilizeClient.ts @@ -1,6 +1,6 @@ import { Sequelize } from 'sequelize/types' -import { Models } from '@xrengine/common/declarations' +import { Models } from '@etherealengine/common/declarations' import { Application } from '../../declarations' diff --git a/packages/server-core/tests/setup.js b/packages/server-core/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/server-core/tests/setup.js +++ b/packages/server-core/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/server/LICENSE b/packages/server/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/server/LICENSE +++ b/packages/server/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/server/openapi.json b/packages/server/openapi.json index 427163d9ba..5c8fecffa2 100755 --- a/packages/server/openapi.json +++ b/packages/server/openapi.json @@ -1,7 +1,7 @@ { "info": { - "title": "XREngine API Surface", - "description": "APIs for the XREngine application", + "title": "Ethereal Engine API Surface", + "description": "APIs for the Ethereal Engine application", "version": "1.0.0" }, "paths": { diff --git a/packages/server/package.json b/packages/server/package.json index 9b159cc8dc..acf76177ed 100755 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { - "name": "@xrengine/server", - "description": "API Server for XREngine", + "name": "@etherealengine/server", + "description": "API Server for Ethereal Engine", "version": "1.1.3", "private": true, "homepage": "", @@ -17,8 +17,8 @@ "vr" ], "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.org" }, "contributors": [], "bugs": {}, @@ -51,7 +51,7 @@ "@feathersjs/transport-commons": "5.0.0-pre.29", "@kubernetes/client-node": "0.16.3", "@swc/core": "^1.2.210", - "@xrengine/server-core": "^1.1.3", + "@etherealengine/server-core": "^1.1.3", "aws-sdk": "2.1113.0", "cli": "1.0.1", "compression": "1.7.4", diff --git a/packages/server/scripts/upload-avatar.js b/packages/server/scripts/upload-avatar.js index 9d8f57cfbd..ddf1bd3a66 100755 --- a/packages/server/scripts/upload-avatar.js +++ b/packages/server/scripts/upload-avatar.js @@ -19,7 +19,7 @@ const s3 = new aws.S3({ const db = { username: process.env.MYSQL_USER || 'server', password: process.env.MYSQL_PASSWORD || 'password', - database: process.env.MYSQL_DATABASE || 'xrengine', + database: process.env.MYSQL_DATABASE || 'etherealengine', host: process.env.MYSQL_HOST || '127.0.0.1', port: process.env.MYSQL_PORT || 3306, dialect: 'mysql', diff --git a/packages/server/src/channels.ts b/packages/server/src/channels.ts index 0fb14fb357..88583d19c0 100755 --- a/packages/server/src/channels.ts +++ b/packages/server/src/channels.ts @@ -1,6 +1,6 @@ import '@feathersjs/transport-commons' -import { Application } from '@xrengine/server-core/declarations' +import { Application } from '@etherealengine/server-core/declarations' export default (app: Application): void => { if (typeof app.channel !== 'function') { diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 40cdc5f35c..699edf1ad7 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,4 +1,4 @@ -import { updateAppConfig } from '@xrengine/server-core/src/updateAppConfig' +import { updateAppConfig } from '@etherealengine/server-core/src/updateAppConfig' const init = async () => { await updateAppConfig() diff --git a/packages/server/src/migrations/config.ts b/packages/server/src/migrations/config.ts index 8edcdade19..267068d11b 100755 --- a/packages/server/src/migrations/config.ts +++ b/packages/server/src/migrations/config.ts @@ -1,4 +1,4 @@ -import { db } from '@xrengine/server-core/src/appconfig' +import { db } from '@etherealengine/server-core/src/appconfig' const env = process.env.APP_ENV || 'development' diff --git a/packages/server/src/start.ts b/packages/server/src/start.ts index 863be863c4..e311981300 100644 --- a/packages/server/src/start.ts +++ b/packages/server/src/start.ts @@ -4,11 +4,11 @@ import path from 'path' import psList from 'ps-list' import favicon from 'serve-favicon' -import { ServerMode } from '@xrengine/server-core/declarations' -import config from '@xrengine/server-core/src/appconfig' -import { createFeathersExpressApp } from '@xrengine/server-core/src/createApp' -import { StartCorsServer } from '@xrengine/server-core/src/createCorsServer' -import multiLogger from '@xrengine/server-core/src/ServerLogger' +import { ServerMode } from '@etherealengine/server-core/declarations' +import config from '@etherealengine/server-core/src/appconfig' +import { createFeathersExpressApp } from '@etherealengine/server-core/src/createApp' +import { StartCorsServer } from '@etherealengine/server-core/src/createCorsServer' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' import channels from './channels' @@ -47,7 +47,7 @@ export const start = async (): Promise => { // Check for child process with mac OSX // exec("docker ps | grep mariadb", (err, stdout, stderr) => { // if(!stdout.includes("mariadb")){ - // throw new Error('\x1b[33mError: DB proccess is not running or Docker is not running!. If you are in local development, please run xrengine/scripts/start-db.sh and restart server\x1b[0m'); + // throw new Error('\x1b[33mError: DB proccess is not running or Docker is not running!. If you are in local development, please run etherealengine/scripts/start-db.sh and restart server\x1b[0m'); // } // }); } diff --git a/packages/taskserver/LICENSE b/packages/taskserver/LICENSE index 17630e2a5b..5f9463deea 100755 --- a/packages/taskserver/LICENSE +++ b/packages/taskserver/LICENSE @@ -1,8 +1,8 @@ ============================================================================ ============================================================================ -Some portions of the XREngine codebase are derived from other projects. -All original work by the XREngine team is subject to MIT license. +Some portions of the Ethereal Engine team, formerly XREngine by XR Foundation codebase are derived from other projects. +All original work by the Ethereal Engine team, formerly XREngine by XR Foundation team is subject to MIT license. @@ -11,7 +11,7 @@ All original work by the XREngine team is subject to MIT license. MIT License -Copyright (c) 2020-2022 XREngine +Copyright (c) 2020-2023 Ethereal Engine team, formerly XREngine by XR Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/taskserver/package.json b/packages/taskserver/package.json index 886640db6e..e5e41c8844 100755 --- a/packages/taskserver/package.json +++ b/packages/taskserver/package.json @@ -1,10 +1,10 @@ { - "name": "@xrengine/taskserver", + "name": "@etherealengine/taskserver", "description": "Task server for EtherealEngine platform", "version": "1.1.3", "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "homepage": "a", "publishConfig": { @@ -23,8 +23,8 @@ "vr" ], "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.org" }, "contributors": [], "bugs": {}, @@ -36,15 +36,14 @@ "start": "cross-env APP_ENV=production ts-node --swc src/index.ts", "dev": "cross-env APP_ENV=development NODE_OPTIONS='--inspect' ts-node --swc src/index.ts", "test": "exit 0", - "validate": "npm run build && npm run test", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "validate": "npm run build && npm run test" }, "dependencies": { "@feathersjs/express": "5.0.0-pre.29", "@feathersjs/feathers": "5.0.0-pre.29", "@feathersjs/primus": "4.5.15", "@swc/core": "^1.2.210", - "@xrengine/server-core": "^1.1.3", + "@etherealengine/server-core": "^1.1.3", "compression": "1.7.4", "cors": "2.8.5", "cross-env": "7.0.3", diff --git a/packages/taskserver/scripts/update-name-gh-package.js b/packages/taskserver/scripts/update-name-gh-package.js deleted file mode 100644 index 7df5b018ea..0000000000 --- a/packages/taskserver/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/taskserver'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/taskserver/src/collect-analytics.ts b/packages/taskserver/src/collect-analytics.ts index be56be8fc3..21818b6a2f 100644 --- a/packages/taskserver/src/collect-analytics.ts +++ b/packages/taskserver/src/collect-analytics.ts @@ -1,5 +1,5 @@ -import config from '@xrengine/server-core/src/appconfig' -import multiLogger from '@xrengine/server-core/src/ServerLogger' +import config from '@etherealengine/server-core/src/appconfig' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' const logger = multiLogger.child({ component: 'taskserver:collect-analytics' }) diff --git a/packages/taskserver/src/index.ts b/packages/taskserver/src/index.ts index 40cdc5f35c..699edf1ad7 100644 --- a/packages/taskserver/src/index.ts +++ b/packages/taskserver/src/index.ts @@ -1,4 +1,4 @@ -import { updateAppConfig } from '@xrengine/server-core/src/updateAppConfig' +import { updateAppConfig } from '@etherealengine/server-core/src/updateAppConfig' const init = async () => { await updateAppConfig() diff --git a/packages/taskserver/src/start.ts b/packages/taskserver/src/start.ts index 154d9ee829..de84c595d4 100644 --- a/packages/taskserver/src/start.ts +++ b/packages/taskserver/src/start.ts @@ -1,8 +1,8 @@ -import { pipe } from '@xrengine/common/src/utils/pipe' -import { Application, ServerMode } from '@xrengine/server-core/declarations' -import config from '@xrengine/server-core/src/appconfig' -import { configurePrimus, configureRedis, createFeathersExpressApp } from '@xrengine/server-core/src/createApp' -import multiLogger from '@xrengine/server-core/src/ServerLogger' +import { pipe } from '@etherealengine/common/src/utils/pipe' +import { Application, ServerMode } from '@etherealengine/server-core/declarations' +import config from '@etherealengine/server-core/src/appconfig' +import { configurePrimus, configureRedis, createFeathersExpressApp } from '@etherealengine/server-core/src/createApp' +import multiLogger from '@etherealengine/server-core/src/ServerLogger' import collectAnalytics from './collect-analytics' diff --git a/packages/ui/.storybook/preview.jsx b/packages/ui/.storybook/preview.jsx index e0488266fd..0b9871e9af 100644 --- a/packages/ui/.storybook/preview.jsx +++ b/packages/ui/.storybook/preview.jsx @@ -17,9 +17,9 @@ import results from '../tests/jest-test-results.json' import { withThemes } from '@react-theming/storybook-addon' -import GlobalStyle from '@xrengine/client-core/src/util/GlobalStyle' +import GlobalStyle from '@etherealengine/client-core/src/util/GlobalStyle' -import { theme as defaultTheme, useTheme } from '@xrengine/client-core/src/theme' +import { theme as defaultTheme, useTheme } from '@etherealengine/client-core/src/theme' // const providerFn = ({ theme, children }) => { // const compliledTheme = useTheme(theme) diff --git a/packages/ui/package.json b/packages/ui/package.json index 0ea2c2fbcc..dcaee60e62 100755 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,19 +1,19 @@ { - "name": "@xrengine/ui", + "name": "@etherealengine/ui", "version": "1.1.3", "description": "A declarative way to build 3D/VR/AR/XR apps that scale. Built with tooling web developers will love, using conventions that game developers and creative coders will find straightforward familiar.", - "homepage": "https://github.com/XRFoundation/XREngine#readme", + "homepage": "https://github.com/etherealengine/etherealengine#readme", "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io", - "url": "http://github.com/XRFoundation" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.org", + "url": "http://github.com/etherealengine" }, "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "bugs": { - "url": "https://github.com/XRFoundation/XREngine/issues" + "url": "https://github.com/etherealengine/etherealengine/issues" }, "engines": { "node": ">= 18.12.0" diff --git a/packages/ui/scripts/update-name-gh-package.js b/packages/ui/scripts/update-name-gh-package.js deleted file mode 100644 index bc3de07bde..0000000000 --- a/packages/ui/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/ui'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/ui/src/Dashboard/index.tsx b/packages/ui/src/Dashboard/index.tsx index f023c2c1d0..5e8ef123ba 100755 --- a/packages/ui/src/Dashboard/index.tsx +++ b/packages/ui/src/Dashboard/index.tsx @@ -1,17 +1,17 @@ import clsx from 'clsx' import React, { useState } from 'react' -import ProfileMenu from '@xrengine/client-core/src/user/components/UserMenu/menus/ProfileMenu' -import SettingMenu from '@xrengine/client-core/src/user/components/UserMenu/menus/SettingMenu' -import { Views } from '@xrengine/client-core/src/user/components/UserMenu/util' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import AppBar from '@xrengine/ui/src/AppBar' -import Box from '@xrengine/ui/src/Box' -import Drawer from '@xrengine/ui/src/Drawer' -import Icon from '@xrengine/ui/src/Icon' -import IconButton from '@xrengine/ui/src/IconButton' -import Popover from '@xrengine/ui/src/Popover' -import Typography from '@xrengine/ui/src/Typography' +import ProfileMenu from '@etherealengine/client-core/src/user/components/UserMenu/menus/ProfileMenu' +import SettingMenu from '@etherealengine/client-core/src/user/components/UserMenu/menus/SettingMenu' +import { Views } from '@etherealengine/client-core/src/user/components/UserMenu/util' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import AppBar from '@etherealengine/ui/src/AppBar' +import Box from '@etherealengine/ui/src/Box' +import Drawer from '@etherealengine/ui/src/Drawer' +import Icon from '@etherealengine/ui/src/Icon' +import IconButton from '@etherealengine/ui/src/IconButton' +import Popover from '@etherealengine/ui/src/Popover' +import Typography from '@etherealengine/ui/src/Typography' import { useTheme } from '@mui/material/styles' diff --git a/packages/ui/src/DashboardItems/index.tsx b/packages/ui/src/DashboardItems/index.tsx index 2d3cb309fe..ee60065960 100644 --- a/packages/ui/src/DashboardItems/index.tsx +++ b/packages/ui/src/DashboardItems/index.tsx @@ -1,6 +1,6 @@ import React from 'react' -import Icon from '@xrengine/ui/src/Icon' +import Icon from '@etherealengine/ui/src/Icon' export const SidebarItems = (allowedRoutes) => [ allowedRoutes.analytics && { diff --git a/packages/ui/src/DashboardMenuItem/index.tsx b/packages/ui/src/DashboardMenuItem/index.tsx index 262dff7480..9e1b9bd73f 100644 --- a/packages/ui/src/DashboardMenuItem/index.tsx +++ b/packages/ui/src/DashboardMenuItem/index.tsx @@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Link, useLocation } from 'react-router-dom' -import { useAuthState } from '@xrengine/client-core/src/user/services/AuthService' -import Divider from '@xrengine/ui/src/Divider' -import List from '@xrengine/ui/src/List' -import ListItem from '@xrengine/ui/src/ListItem' -import ListItemIcon from '@xrengine/ui/src/ListItemIcon' -import ListItemText from '@xrengine/ui/src/ListItemText' +import { useAuthState } from '@etherealengine/client-core/src/user/services/AuthService' +import Divider from '@etherealengine/ui/src/Divider' +import List from '@etherealengine/ui/src/List' +import ListItem from '@etherealengine/ui/src/ListItem' +import ListItemIcon from '@etherealengine/ui/src/ListItemIcon' +import ListItemText from '@etherealengine/ui/src/ListItemText' import { SidebarItems } from '../DashboardItems' import styles from './index.module.scss' diff --git a/packages/xrui/functions/ActionFunctions.ts b/packages/xrui/functions/ActionFunctions.ts index 66ea29c6ab..4460ae38c9 100644 --- a/packages/xrui/functions/ActionFunctions.ts +++ b/packages/xrui/functions/ActionFunctions.ts @@ -1,11 +1,11 @@ import { MathUtils } from 'three' import { matches, Validator } from 'ts-matches' -import { OpaqueType } from '@xrengine/common/src/interfaces/OpaqueType' -import { PeerID } from '@xrengine/common/src/interfaces/PeerID' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import multiLogger from '@xrengine/common/src/logger' -import { deepEqual } from '@xrengine/engine/src/common/functions/deepEqual' +import { OpaqueType } from '@etherealengine/common/src/interfaces/OpaqueType' +import { PeerID } from '@etherealengine/common/src/interfaces/PeerID' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import multiLogger from '@etherealengine/common/src/logger' +import { deepEqual } from '@etherealengine/engine/src/common/functions/deepEqual' import { HyperFlux } from './StoreFunctions' diff --git a/packages/xrui/package.json b/packages/xrui/package.json index 6d03791a16..dd8da91956 100644 --- a/packages/xrui/package.json +++ b/packages/xrui/package.json @@ -1,8 +1,8 @@ { - "name": "@xrengine/xrui", + "name": "@etherealengine/xrui", "version": "1.1.3", "description": "A set of utilities for using DOM elements to create immerive user interfaces", - "homepage": "https://github.com/XRFoundation/XREngine#readme", + "homepage": "https://github.com/etherealengine/etherealengine#readme", "keywords": [ "3D", "AR", @@ -14,15 +14,15 @@ ], "repository": { "type": "git", - "url": "git://github.com/XRFoundation/XREngine.git" + "url": "git://github.com/etherealengine/etherealengine.git" }, "author": { - "name": "XRFoundation Collective", - "email": "hello@xrfoundation.io", - "url": "http://github.com/XRFoundation" + "name": "Ethereal Engine Collective", + "email": "hello@etherealengine.org", + "url": "http://github.com/etherealengine" }, "bugs": { - "url": "https://github.com/XRFoundation/XREngine/issues" + "url": "https://github.com/etherealengine/etherealengine/issues" }, "engines": { "node": ">= 18.12.0" @@ -36,8 +36,7 @@ "build": "tsc && npm run build:worker && npm run build:encoder", "build:worker": "esbuild core/textures/KTX2Worker.ts --bundle --format=esm --outfile=core/textures/KTX2Worker.bundle.txt --loader:.wasm=binary", "build:encoder": "esbuild core/textures/KTX2Encoder.ts --bundle --format=esm --outfile=core/textures/KTX2Encoder.bundle.js", - "test": "cross-env TEST=true mocha --config .mocharc.cjs", - "update-name-gh-package": "node scripts/update-name-gh-package.js" + "test": "cross-env TEST=true mocha --config .mocharc.cjs" }, "dependencies": { "@juggle/resize-observer": "^3.2.0", diff --git a/packages/xrui/scripts/update-name-gh-package.js b/packages/xrui/scripts/update-name-gh-package.js deleted file mode 100644 index c2289a0eba..0000000000 --- a/packages/xrui/scripts/update-name-gh-package.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -(() => { - const packageContents = JSON.parse(fs.readFileSync('./package.json').toString()); - packageContents.name = '@XRFoundation/xrui'; - fs.writeFileSync('./package.json', Buffer.from(JSON.stringify(packageContents))); -})(); \ No newline at end of file diff --git a/packages/xrui/tests/setup.js b/packages/xrui/tests/setup.js index 515f929d3b..08c05dcec2 100644 --- a/packages/xrui/tests/setup.js +++ b/packages/xrui/tests/setup.js @@ -8,24 +8,24 @@ require("ts-node").register({ process.on('warning', e => console.warn(e.stack)); process.on('SIGTERM', async (err) => { - console.log('[XREngine Tests]: Server SIGTERM') + console.log('[Ethereal Engine Tests]: Server SIGTERM') console.log(err) }) process.on('SIGINT', () => { - console.log('[XREngine Tests]: RECEIVED SIGINT') + console.log('[Ethereal Engine Tests]: RECEIVED SIGINT') process.exit() }) //emitted when an uncaught JavaScript exception bubbles process.on('uncaughtException', (err) => { - console.log('[XREngine Tests]: UNCAUGHT EXCEPTION') + console.log('[Ethereal Engine Tests]: UNCAUGHT EXCEPTION') console.log(err) process.exit() }) //emitted whenever a Promise is rejected and no error handler is attached to it process.on('unhandledRejection', (reason, p) => { - console.log('[XREngine Tests]: UNHANDLED REJECTION') + console.log('[Ethereal Engine Tests]: UNHANDLED REJECTION') console.log(reason) console.log(p) process.exit() diff --git a/packages/xrui/tests/xrui.test.ts b/packages/xrui/tests/xrui.test.ts index a8ec126862..5152240d43 100644 --- a/packages/xrui/tests/xrui.test.ts +++ b/packages/xrui/tests/xrui.test.ts @@ -1,4 +1,4 @@ import assert from 'assert' -import { UserId } from '@xrengine/common/src/interfaces/UserId' -import { matches, matchesWithDefault } from '@xrengine/engine/src/common/functions/MatchesUtils' +import { UserId } from '@etherealengine/common/src/interfaces/UserId' +import { matches, matchesWithDefault } from '@etherealengine/engine/src/common/functions/MatchesUtils' diff --git a/scripts/build_microk8s.sh b/scripts/build_microk8s.sh index 36d181efff..6057c3bd71 100755 --- a/scripts/build_microk8s.sh +++ b/scripts/build_microk8s.sh @@ -39,7 +39,7 @@ fi if [ -z "$MYSQL_DATABASE" ] then - MYSQL_DATABASE=xrengine + MYSQL_DATABASE=etherealengine else MYSQL_DATABASE=$MYSQL_DATABASE fi @@ -100,7 +100,7 @@ else NODE_ENV=$NODE_ENV fi -docker start xrengine_minikube_db +docker start etherealengine_minikube_db mkdir -p ./project-package-jsons/projects/default-project cp packages/projects/default-project/package.json ./project-package-jsons/projects/default-project @@ -110,7 +110,7 @@ DOCKER_BUILDKIT=1 docker build -t $REGISTRY_HOST:32000/root-builder -f dockerfil docker push $REGISTRY_HOST:32000/root-builder -DOCKER_BUILDKIT=1 docker build --network=host -t $REGISTRY_HOST:32000/xrengine \ +DOCKER_BUILDKIT=1 docker build --network=host -t $REGISTRY_HOST:32000/etherealengine \ --build-arg NODE_ENV=$NODE_ENV \ --build-arg MYSQL_HOST=$MYSQL_HOST \ --build-arg MYSQL_PORT=$MYSQL_PORT \ @@ -127,8 +127,8 @@ DOCKER_BUILDKIT=1 docker build --network=host -t $REGISTRY_HOST:32000/xrengine \ --build-arg VITE_8TH_WALL=$VITE_8TH_WALL \ --build-arg VITE_LOGIN_WITH_WALLET=$VITE_LOGIN_WITH_WALLET . -docker push $REGISTRY_HOST:32000/xrengine +docker push $REGISTRY_HOST:32000/etherealengine -#DOCKER_BUILDKIT=1 docker build -t $REGISTRY_HOST:32000/xrengine-testbot -f ./dockerfiles/testbot/Dockerfile-testbot . +#DOCKER_BUILDKIT=1 docker build -t $REGISTRY_HOST:32000/etherealengine-testbot -f ./dockerfiles/testbot/Dockerfile-testbot . -# docker push $REGISTRY_HOST:32000/xrengine-testbot +# docker push $REGISTRY_HOST:32000/etherealengine-testbot diff --git a/scripts/build_minikube.sh b/scripts/build_minikube.sh index 6fdc04d93a..70f0ab1b5b 100755 --- a/scripts/build_minikube.sh +++ b/scripts/build_minikube.sh @@ -32,7 +32,7 @@ fi if [ -z "$MYSQL_DATABASE" ] then - MYSQL_DATABASE=xrengine + MYSQL_DATABASE=etherealengine else MYSQL_DATABASE=$MYSQL_DATABASE fi @@ -93,7 +93,7 @@ else NODE_ENV=$NODE_ENV fi -docker start xrengine_minikube_db +docker start etherealengine_minikube_db eval $(minikube docker-env) mkdir -p ./project-package-jsons/projects/default-project @@ -102,7 +102,7 @@ find packages/projects/projects/ -name package.json -exec bash -c 'mkdir -p ./pr DOCKER_BUILDKIT=1 docker build -t root-builder -f dockerfiles/package-root/Dockerfile-root . -DOCKER_BUILDKIT=1 docker build -t xrengine \ +DOCKER_BUILDKIT=1 docker build -t etherealengine \ --build-arg NODE_ENV=$NODE_ENV \ --build-arg MYSQL_HOST=$MYSQL_HOST \ --build-arg MYSQL_PORT=$MYSQL_PORT \ @@ -119,4 +119,4 @@ DOCKER_BUILDKIT=1 docker build -t xrengine \ --build-arg VITE_8TH_WALL=$VITE_8TH_WALL \ --build-arg VITE_LOGIN_WITH_WALLET=$VITE_LOGIN_WITH_WALLET . -#DOCKER_BUILDKIT=1 docker build -t xrengine-testbot -f ./dockerfiles/testbot/Dockerfile-testbot . \ No newline at end of file +#DOCKER_BUILDKIT=1 docker build -t etherealengine-testbot -f ./dockerfiles/testbot/Dockerfile-testbot . \ No newline at end of file diff --git a/scripts/check-db-exists-only.ts b/scripts/check-db-exists-only.ts index 26f070381f..301e9a126a 100644 --- a/scripts/check-db-exists-only.ts +++ b/scripts/check-db-exists-only.ts @@ -4,7 +4,7 @@ import { Sequelize } from 'sequelize' const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql' diff --git a/scripts/check-db-exists.ts b/scripts/check-db-exists.ts index 2c149339b4..646c21c7f9 100644 --- a/scripts/check-db-exists.ts +++ b/scripts/check-db-exists.ts @@ -15,7 +15,7 @@ if (!kubernetesEnabled) { const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql' diff --git a/scripts/check-engine.sh b/scripts/check-engine.sh index 5201ef1305..e880fc2462 100755 --- a/scripts/check-engine.sh +++ b/scripts/check-engine.sh @@ -1,7 +1,7 @@ #!/bin/bash -apiName="${RELEASE_NAME}-xrengine-api" -clientName="${RELEASE_NAME}-xrengine-client" +apiName="${RELEASE_NAME}-etherealengine-api" +clientName="${RELEASE_NAME}-etherealengine-client" instanceserverName="${RELEASE_NAME}-instanceserver" apiCount=$(kubectl get deploy $apiName -o jsonpath='{.status.availableReplicas}') @@ -46,5 +46,5 @@ until [ "${instanceserverCount}" -ge 1 ]; do echo "Instanceserver ready count: $instanceserverCount" done -echo "XREngine is now ready" +echo "Ethereal Engine is now ready" exit 0 diff --git a/scripts/check-testbot.sh b/scripts/check-testbot.sh index 5b2d7039bf..6f9decee0d 100755 --- a/scripts/check-testbot.sh +++ b/scripts/check-testbot.sh @@ -7,7 +7,7 @@ TAG=$2 expectedTag="$TAG*" echo "Expected tag: $expectedTag" -jobName="${STAGE}-xrengine-testbot" +jobName="${STAGE}-etherealengine-testbot" # Get the current image tag of testbot job. imageName=$(kubectl get job $jobName -o=jsonpath='{$.spec.template.spec.containers[:1].image}') @@ -17,9 +17,9 @@ echo "Current tag: $tag" # This is incase pipeline failed. So force helm to redeploy testbot. if [[ $tag = $expectedTag ]] then - kubectl delete job $STAGE-xrengine-testbot + kubectl delete job $STAGE-etherealengine-testbot - helm upgrade --reuse-values $STAGE xrengine/xrengine + helm upgrade --reuse-values $STAGE etherealengine/etherealengine fi # Wait until correct image tag is used. diff --git a/scripts/clear-projects-rebuild.js b/scripts/clear-projects-rebuild.js index 2f9e915abb..01913a0731 100644 --- a/scripts/clear-projects-rebuild.js +++ b/scripts/clear-projects-rebuild.js @@ -13,7 +13,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql' diff --git a/scripts/convert-avatars.ts b/scripts/convert-avatars.ts index 4e1ae022ab..dc1b8afb2e 100755 --- a/scripts/convert-avatars.ts +++ b/scripts/convert-avatars.ts @@ -6,10 +6,10 @@ import dotenv from 'dotenv-flow' import fetch from 'node-fetch' import Sequelize, { DataTypes, Op } from 'sequelize' -import { ServerMode } from '@xrengine/server-core/declarations' -import { createFeathersExpressApp } from '@xrengine/server-core/src/createApp' -import { getCachedURL } from '@xrengine/server-core/src/media/storageprovider/getCachedURL' -import { addGenericAssetToS3AndStaticResources } from '@xrengine/server-core/src/media/upload-asset/upload-asset.service' +import { ServerMode } from '@etherealengine/server-core/declarations' +import { createFeathersExpressApp } from '@etherealengine/server-core/src/createApp' +import { getCachedURL } from '@etherealengine/server-core/src/media/storageprovider/getCachedURL' +import { addGenericAssetToS3AndStaticResources } from '@etherealengine/server-core/src/media/upload-asset/upload-asset.service' dotenv.config({ path: appRootPath.path, @@ -18,7 +18,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql' diff --git a/scripts/convert-user-roles.js b/scripts/convert-user-roles.js index cdf0722d2e..60a41e5051 100755 --- a/scripts/convert-user-roles.js +++ b/scripts/convert-user-roles.js @@ -11,7 +11,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql' diff --git a/scripts/copy-client-to-localstorage.ts b/scripts/copy-client-to-localstorage.ts index 8c323b5ab2..11a30e1672 100644 --- a/scripts/copy-client-to-localstorage.ts +++ b/scripts/copy-client-to-localstorage.ts @@ -4,7 +4,7 @@ import cli from 'cli' import fs from 'fs' import path from 'path' -import { copyFolderRecursiveSync, deleteFolderRecursive } from '@xrengine/server-core/src/util/fsHelperFunctions' +import { copyFolderRecursiveSync, deleteFolderRecursive } from '@etherealengine/server-core/src/util/fsHelperFunctions' cli.enable('status') diff --git a/scripts/create-build-status.ts b/scripts/create-build-status.ts index eba784b3c3..bc2397d248 100644 --- a/scripts/create-build-status.ts +++ b/scripts/create-build-status.ts @@ -13,7 +13,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql', diff --git a/scripts/delete-old-s3-files.ts b/scripts/delete-old-s3-files.ts index c8c76016f8..62f5773aee 100644 --- a/scripts/delete-old-s3-files.ts +++ b/scripts/delete-old-s3-files.ts @@ -6,7 +6,7 @@ import fs from 'fs' import { createDefaultStorageProvider, getStorageProvider -} from '@xrengine/server-core/src/media/storageprovider/storageprovider' +} from '@etherealengine/server-core/src/media/storageprovider/storageprovider' cli.enable('status') diff --git a/scripts/deploy.sh b/scripts/deploy.sh index edf01cf7e9..42594c3b53 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -3,7 +3,7 @@ set -x STAGE=$1 TAG=$2 -#kubectl delete job $STAGE-xrengine-testbot +#kubectl delete job $STAGE-etherealengine-testbot docker manifest inspect $ECR_URL/$REPO_NAME-api:$TAG >api-image.txt 2>&1 docker manifest inspect $ECR_URL/$REPO_NAME-client:$TAG > client-image.txt 2>&1 @@ -27,5 +27,5 @@ then echo "Taskserver image was not built and uploaded properly" exit 1 else - helm upgrade --reuse-values --set taskserver.image.repository=$ECR_URL/$REPO_NAME-taskserver,taskserver.image.tag=$TAG,api.image.repository=$ECR_URL/$REPO_NAME-api,api.image.tag=$TAG,instanceserver.image.repository=$ECR_URL/$REPO_NAME-instanceserver,instanceserver.image.tag=$TAG,testbot.image.repository=$ECR_URL/$REPO_NAME-testbot,testbot.image.tag=$TAG,client.image.repository=$ECR_URL/$REPO_NAME-client,client.image.tag=$TAG $STAGE xrengine/xrengine + helm upgrade --reuse-values --set taskserver.image.repository=$ECR_URL/$REPO_NAME-taskserver,taskserver.image.tag=$TAG,api.image.repository=$ECR_URL/$REPO_NAME-api,api.image.tag=$TAG,instanceserver.image.repository=$ECR_URL/$REPO_NAME-instanceserver,instanceserver.image.tag=$TAG,testbot.image.repository=$ECR_URL/$REPO_NAME-testbot,testbot.image.tag=$TAG,client.image.repository=$ECR_URL/$REPO_NAME-client,client.image.tag=$TAG $STAGE etherealengine/etherealengine fi diff --git a/scripts/deploy_builder.sh b/scripts/deploy_builder.sh index 10a8c388e0..5f88b6f30d 100755 --- a/scripts/deploy_builder.sh +++ b/scripts/deploy_builder.sh @@ -5,4 +5,4 @@ STAGE=$1 TAG=$2 EEVERSION=$(jq -r .version ./packages/server-core/package.json) -helm upgrade --install --reuse-values --set builder.image.tag="${EEVERSION}_${TAG}" $STAGE-builder xrengine/xrengine-builder +helm upgrade --install --reuse-values --set builder.image.tag="${EEVERSION}_${TAG}" $STAGE-builder etherealengine/etherealengine-builder diff --git a/scripts/dev-tabs.sh b/scripts/dev-tabs.sh index 58f79cbb1e..de86ec5782 100755 --- a/scripts/dev-tabs.sh +++ b/scripts/dev-tabs.sh @@ -10,16 +10,16 @@ sleep 1 npx ttab -t 'serve-local-files' -d ../packages/server npm run serve-local-files ## Start client -npx ttab -t 'xrengine-client' -d ../packages/client npm run dev +npx ttab -t 'etherealengine-client' -d ../packages/client npm run dev ## Start api server -npx ttab -t 'xrengine-api' -d ../packages/server npm run dev-api-server +npx ttab -t 'etherealengine-api' -d ../packages/server npm run dev-api-server ## Start world instanceserver -npx ttab -t 'xrengine-world-instanceserver' -d ../packages/instanceserver npm run dev +npx ttab -t 'etherealengine-world-instanceserver' -d ../packages/instanceserver npm run dev ## Start channel instanceserver -npx ttab -t 'xrengine-channel-instanceserver' -d ../packages/instanceserver npm run dev-channel +npx ttab -t 'etherealengine-channel-instanceserver' -d ../packages/instanceserver npm run dev-channel ## Start task server -npx ttab -t 'xrengine-taskserver' -d ../packages/taskserver npm run dev \ No newline at end of file +npx ttab -t 'etherealengine-taskserver' -d ../packages/taskserver npm run dev \ No newline at end of file diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml index 849b35874c..27ee4b4332 100755 --- a/scripts/docker-compose.yml +++ b/scripts/docker-compose.yml @@ -3,37 +3,37 @@ version: '2.3' services: db: image: mariadb:10.7 - container_name: xrengine_db + container_name: etherealengine_db environment: - MYSQL_ROOT_PASSWORD: xrengine-root - MYSQL_DATABASE: xrengine + MYSQL_ROOT_PASSWORD: etherealengine-root + MYSQL_DATABASE: etherealengine MYSQL_USER: server MYSQL_PASSWORD: password ports: - '3306:3306' testdb: image: mariadb:10.7 - container_name: xrengine_test_db + container_name: etherealengine_test_db environment: - MYSQL_ROOT_PASSWORD: xrengine-root - MYSQL_DATABASE: xrengine + MYSQL_ROOT_PASSWORD: etherealengine-root + MYSQL_DATABASE: etherealengine MYSQL_USER: server MYSQL_PASSWORD: password ports: - '3305:3306' minikubedb: image: mariadb:10.7 - container_name: xrengine_minikube_db + container_name: etherealengine_minikube_db environment: - MYSQL_ROOT_PASSWORD: xrengine-root - MYSQL_DATABASE: xrengine + MYSQL_ROOT_PASSWORD: etherealengine-root + MYSQL_DATABASE: etherealengine MYSQL_USER: server MYSQL_PASSWORD: password ports: - '3304:3306' redis: image: redis - container_name: xrengine_redis + container_name: etherealengine_redis command: redis-server ports: - '6379:6379' diff --git a/scripts/generate-certs.sh b/scripts/generate-certs.sh index cf60ae37b6..57c7c6fce8 100755 --- a/scripts/generate-certs.sh +++ b/scripts/generate-certs.sh @@ -10,7 +10,7 @@ case "$(uname -s)" in Linux) mkdir -p ../certs openssl req -nodes -new -x509 -keyout ../certs/key.pem -out ../certs/cert.pem - cp ../certs/cert.pem /usr/local/share/ca-certificates/xrengine-local-certificate.crt + cp ../certs/cert.pem /usr/local/share/ca-certificates/etherealengine-local-certificate.crt dpkg-reconfigure ca-certificates ;; CYGWIN*|MINGW32*|MSYS*|MINGW*) diff --git a/scripts/get-deletable-client-files.ts b/scripts/get-deletable-client-files.ts index f7b147699b..7045e3e1c7 100644 --- a/scripts/get-deletable-client-files.ts +++ b/scripts/get-deletable-client-files.ts @@ -6,7 +6,7 @@ import fs from 'fs' import { createDefaultStorageProvider, getStorageProvider -} from '@xrengine/server-core/src/media/storageprovider/storageprovider' +} from '@etherealengine/server-core/src/media/storageprovider/storageprovider' const UNIQUIFIED_FILE_NAME_REGEX = /\.[a-zA-Z0-9]{8}$/ diff --git a/scripts/install-projects.js b/scripts/install-projects.js index 42e85c9975..db9a2a010b 100755 --- a/scripts/install-projects.js +++ b/scripts/install-projects.js @@ -1,20 +1,20 @@ -import { download } from "@xrengine/server-core/src/projects/project/downloadProjects"; -import { createDefaultStorageProvider } from "@xrengine/server-core/src/media/storageprovider/storageprovider"; +import { download } from "@etherealengine/server-core/src/projects/project/downloadProjects"; +import { createDefaultStorageProvider } from "@etherealengine/server-core/src/media/storageprovider/storageprovider"; import dotenv from 'dotenv'; import Sequelize from 'sequelize'; import path from "path"; import fs from "fs"; import appRootPath from 'app-root-path' -import logger from '@xrengine/server-core/src/ServerLogger' -import { createFeathersExpressApp } from '@xrengine/server-core/src/createApp' -import { ServerMode } from '@xrengine/server-core/declarations' -import { getProjectConfig, onProjectEvent } from '@xrengine/server-core/src/projects/project/project-helper' +import logger from '@etherealengine/server-core/src/ServerLogger' +import { createFeathersExpressApp } from '@etherealengine/server-core/src/createApp' +import { ServerMode } from '@etherealengine/server-core/declarations' +import { getProjectConfig, onProjectEvent } from '@etherealengine/server-core/src/projects/project/project-helper' dotenv.config(); const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql' diff --git a/scripts/make-user-admin.js b/scripts/make-user-admin.js index c0d283e11b..9c1120310e 100755 --- a/scripts/make-user-admin.js +++ b/scripts/make-user-admin.js @@ -12,7 +12,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql' diff --git a/scripts/prune_ecr_images.js b/scripts/prune_ecr_images.js index c55d60876b..f57e49f3cd 100755 --- a/scripts/prune_ecr_images.js +++ b/scripts/prune_ecr_images.js @@ -13,7 +13,7 @@ const options = cli.parse({ cli.main(async () => { try { const ecr = options.public === true ? new AWS.ECRPUBLIC({region: 'us-east-1'}) : new AWS.ECR({ region: options.region || 'us-east-1' }); - const result = await ecr.describeImages({repositoryName: options.repoName || 'xrengine'}).promise(); + const result = await ecr.describeImages({repositoryName: options.repoName || 'etherealengine'}).promise(); const images = result.imageDetails; const withoutLatest = images.filter(image => image.imageTags == null || (image.imageTags && image.imageTags.indexOf('latest_dev') < 0 && image.imageTags.indexOf('latest_prod') < 0)); const sorted = withoutLatest.sort((a, b) => b.imagePushedAt - a.imagePushedAt); @@ -21,7 +21,7 @@ cli.main(async () => { if (toBeDeleted.length > 0) { const deleteParams = { imageIds: toBeDeleted.map(image => { return { imageDigest: image.imageDigest } }), - repositoryName: options.repoName || 'xrengine' + repositoryName: options.repoName || 'etherealengine' }; await ecr.batchDeleteImage(deleteParams).promise(); } diff --git a/scripts/push-client-to-s3.ts b/scripts/push-client-to-s3.ts index e17b1309c5..4f2a6f4c8f 100644 --- a/scripts/push-client-to-s3.ts +++ b/scripts/push-client-to-s3.ts @@ -5,14 +5,14 @@ import cli from 'cli' import fs from 'fs' import path from 'path' -import { processFileName } from '@xrengine/common/src/utils/processFileName' +import { processFileName } from '@etherealengine/common/src/utils/processFileName' import { createDefaultStorageProvider, getStorageProvider -} from '@xrengine/server-core/src/media/storageprovider/storageprovider' -import logger from '@xrengine/server-core/src/ServerLogger' -import { getContentType } from '@xrengine/server-core/src/util/fileUtils' -import { getFilesRecursive } from '@xrengine/server-core/src/util/fsHelperFunctions' +} from '@etherealengine/server-core/src/media/storageprovider/storageprovider' +import logger from '@etherealengine/server-core/src/ServerLogger' +import { getContentType } from '@etherealengine/server-core/src/util/fileUtils' +import { getFilesRecursive } from '@etherealengine/server-core/src/util/fsHelperFunctions' cli.enable('status') diff --git a/scripts/record-build-error.ts b/scripts/record-build-error.ts index ee95eb8cc9..775944bd68 100644 --- a/scripts/record-build-error.ts +++ b/scripts/record-build-error.ts @@ -12,7 +12,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql', diff --git a/scripts/record-build-success.ts b/scripts/record-build-success.ts index a5e0ee6401..146644d037 100644 --- a/scripts/record-build-success.ts +++ b/scripts/record-build-success.ts @@ -12,7 +12,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql', diff --git a/scripts/run-xrengine.sh b/scripts/run-xrengine.sh index 55c5247d6a..233ba75767 100755 --- a/scripts/run-xrengine.sh +++ b/scripts/run-xrengine.sh @@ -19,7 +19,7 @@ if ! [ -e /usr/bin/docker ] && [ -e /usr/bin/docker-compose ]; then fi # stop docker container if it's running -db_docker_image_id=`sudo docker ps -q -f name=xrengine` +db_docker_image_id=`sudo docker ps -q -f name=etherealengine` if [ "$db_docker_image_id" ]; then echo -e "${FYEL}Database is running" echo -e "${RS}Stopping another database..." @@ -62,7 +62,7 @@ do ;; "KDE") konsole --tabs-from-file konsole_tabs.desktop & - echo -e "${FGRN}xrengine is running${RS}" + echo -e "${FGRN}etherealengine is running${RS}" exit 0 ;; "Exit") @@ -76,9 +76,9 @@ do esac done -# run xrengine in terminal with tabs +# run etherealengine in terminal with tabs ${terminal_command} \ - --title 'xrengine servers' \ + --title 'etherealengine servers' \ --tab \ --title db --working-directory=$PWD -e 'sudo ./start-db.sh' \ --tab \ @@ -88,5 +88,5 @@ ${terminal_command} \ --tab \ --title client --working-directory=$PWD/../packages/client -e 'npm run dev' & -echo -e "${FGRN}xrengine is running${RS}" +echo -e "${FGRN}etherealengine is running${RS}" exit 0 diff --git a/scripts/run_e2e_tests.ts b/scripts/run_e2e_tests.ts index 2c7bc70d2b..ab786e7d13 100644 --- a/scripts/run_e2e_tests.ts +++ b/scripts/run_e2e_tests.ts @@ -1,7 +1,7 @@ import childProcess from 'child_process' import killPort from 'kill-port' -import config from '@xrengine/server-core/src/appconfig' +import config from '@etherealengine/server-core/src/appconfig' // we may need an alternative to kill-port for mac & windows diff --git a/scripts/setup_helm.sh b/scripts/setup_helm.sh index f693b8c6d1..f003876a05 100755 --- a/scripts/setup_helm.sh +++ b/scripts/setup_helm.sh @@ -20,7 +20,7 @@ curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scrip chmod 700 get_helm.sh ./get_helm.sh -helm repo add xrengine https://helm.xrengine.io +helm repo add etherealengine https://helm.etherealengine.org helm repo update set +x diff --git a/scripts/setup_helm_builder.sh b/scripts/setup_helm_builder.sh index 409dd3b434..e2918dd336 100755 --- a/scripts/setup_helm_builder.sh +++ b/scripts/setup_helm_builder.sh @@ -13,7 +13,7 @@ chmod 700 get_helm.sh ./get_helm.sh -helm repo add xrengine https://helm.xrengine.io +helm repo add etherealengine https://helm.etherealengine.org helm repo update diff --git a/scripts/start-all-docker.sh b/scripts/start-all-docker.sh index 777d16108a..4b1ffcc5a6 100755 --- a/scripts/start-all-docker.sh +++ b/scripts/start-all-docker.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -docker start xrengine_db -docker start xrengine_redis -docker start xrengine_minikube_db -docker start xrengine_test_db \ No newline at end of file +docker start etherealengine_db +docker start etherealengine_redis +docker start etherealengine_minikube_db +docker start etherealengine_test_db \ No newline at end of file diff --git a/scripts/start-db.sh b/scripts/start-db.sh index 7484ac3d3a..0799b61db5 100755 --- a/scripts/start-db.sh +++ b/scripts/start-db.sh @@ -6,8 +6,8 @@ then then echo "✅ Docker & Docker-Compose Detected:" echo -e "\e[32m💾 Initializing mariadb docker image..." - docker stop xrengine - docker rm xrengine + docker stop etherealengine + docker rm etherealengine docker-compose up else echo "❌ Please install docker-compose..." diff --git a/scripts/update-cronjob-image.ts b/scripts/update-cronjob-image.ts index 0690185e9f..ad45edc13d 100644 --- a/scripts/update-cronjob-image.ts +++ b/scripts/update-cronjob-image.ts @@ -2,9 +2,9 @@ import appRootPath from 'app-root-path' import cli from 'cli' import dotenv from 'dotenv-flow' -import { ServerMode } from '@xrengine/server-core/declarations' -import { createFeathersExpressApp } from '@xrengine/server-core/src/createApp' -import { getCronJobBody } from '@xrengine/server-core/src/projects/project/project-helper' +import { ServerMode } from '@etherealengine/server-core/declarations' +import { createFeathersExpressApp } from '@etherealengine/server-core/src/createApp' +import { getCronJobBody } from '@etherealengine/server-core/src/projects/project/project-helper' dotenv.config({ path: appRootPath.path, @@ -14,7 +14,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql', diff --git a/scripts/update-project.ts b/scripts/update-project.ts index df081885bb..8bb4647b79 100644 --- a/scripts/update-project.ts +++ b/scripts/update-project.ts @@ -1,9 +1,10 @@ import appRootPath from 'app-root-path' import cli from 'cli' import dotenv from 'dotenv-flow' -import {createFeathersExpressApp} from "@xrengine/server-core/src/createApp"; -import {ServerMode} from "@xrengine/server-core/declarations"; -import {checkProjectAutoUpdate} from "@xrengine/server-core/src/projects/project/project-helper"; + +import { ServerMode } from '@etherealengine/server-core/declarations' +import { createFeathersExpressApp } from '@etherealengine/server-core/src/createApp' +import { checkProjectAutoUpdate } from '@etherealengine/server-core/src/projects/project/project-helper' dotenv.config({ path: appRootPath.path, @@ -13,7 +14,7 @@ dotenv.config({ const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql', diff --git a/scripts/update-site-manifest.ts b/scripts/update-site-manifest.ts index 4f36a61662..45512b9431 100644 --- a/scripts/update-site-manifest.ts +++ b/scripts/update-site-manifest.ts @@ -5,13 +5,13 @@ import fs from 'fs' import path from 'path' import { DataTypes, Sequelize } from 'sequelize' -import config from '@xrengine/server-core/src/appconfig' -import { getCacheDomain } from '@xrengine/server-core/src/media/storageprovider/getCacheDomain' +import config from '@etherealengine/server-core/src/appconfig' +import { getCacheDomain } from '@etherealengine/server-core/src/media/storageprovider/getCacheDomain' import { createDefaultStorageProvider, getStorageProvider -} from '@xrengine/server-core/src/media/storageprovider/storageprovider' -import { getContentType } from '@xrengine/server-core/src/util/fileUtils' +} from '@etherealengine/server-core/src/media/storageprovider/storageprovider' +import { getContentType } from '@etherealengine/server-core/src/util/fileUtils' const kubernetesEnabled = process.env.KUBERNETES === 'true' if (!kubernetesEnabled) { @@ -24,7 +24,7 @@ if (!kubernetesEnabled) { const db = { username: process.env.MYSQL_USER ?? 'server', password: process.env.MYSQL_PASSWORD ?? 'password', - database: process.env.MYSQL_DATABASE ?? 'xrengine', + database: process.env.MYSQL_DATABASE ?? 'etherealengine', host: process.env.MYSQL_HOST ?? '127.0.0.1', port: process.env.MYSQL_PORT ?? 3306, dialect: 'mysql'