Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Rename to Ethereal Engine #7659

Merged
merged 14 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions .env.local.default
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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=
Expand All @@ -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


Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -188,7 +188,7 @@ STORAGE_AWS_ACCESS_KEY_SECRET=


# Chargebee variables ------------
CHARGEBEE_SITE=xrengine-test
CHARGEBEE_SITE=etherealengine-test
CHARGEBEE_API_KEY=
# --------------------------------

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/tech_support.md
Original file line number Diff line number Diff line change
@@ -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: ''
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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.

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.

Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/branch-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
13 changes: 4 additions & 9 deletions .github/workflows/projects-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/publish-npm-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ 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:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- 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 }}
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .pnpmfile.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"arrowParens": "always",
"proseWrap": "never",
"endOfLine": "lf",
"importOrder": ["<THIRD_PARTY_MODULES>", "^@xrengine/(.*)$", "^@mui/(.*)$", "^[./]"],
"importOrder": ["<THIRD_PARTY_MODULES>", "^@etherealengine/(.*)$", "^@mui/(.*)$", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"importOrderCaseInsensitive": true
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.



Expand All @@ -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
Expand Down
Loading