From 552a4f662a8bc083e79dd3319cb3769dee00a216 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Wed, 18 Dec 2024 19:49:34 +0000 Subject: [PATCH 1/4] chore(package): change to elecord --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9622af82404..24a4858192d 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { - "name": "element-web", + "name": "elecord-web", "version": "1.11.87", - "description": "A feature-rich client for Matrix.org", - "author": "New Vector Ltd.", + "description": "Privacy focused chat app for gamers", + "author": "hazzuk", "repository": { "type": "git", - "url": "https://github.com/element-hq/element-web" + "url": "https://github.com/elecordapp/elecord-web" }, "license": "AGPL-3.0-only OR GPL-3.0-only", "files": [ From e1d909aa7f98137e4b7fe933ba9e2c0d64c7c3c2 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Wed, 18 Dec 2024 19:51:37 +0000 Subject: [PATCH 2/4] fix(changelog): update to elecord --- src/components/views/dialogs/ChangelogDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/ChangelogDialog.tsx b/src/components/views/dialogs/ChangelogDialog.tsx index ae3c157c788..e97fae8a83c 100644 --- a/src/components/views/dialogs/ChangelogDialog.tsx +++ b/src/components/views/dialogs/ChangelogDialog.tsx @@ -30,7 +30,7 @@ interface Commit { }; } -const REPOS = ["element-hq/element-web", "matrix-org/matrix-js-sdk"] as const; +const REPOS = ["elecordapp/elecord-web", "matrix-org/matrix-js-sdk"] as const; export type DevelopVersionString = string & { _developVersionString: never }; From 7258a8c24f16c0616b42a22cad78f5dc064911a4 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Wed, 18 Dec 2024 19:52:05 +0000 Subject: [PATCH 3/4] chore(scripts): update to elecord --- scripts/fetchdep.sh | 4 ++-- scripts/layered.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh index 666a74ff67c..df4de14bf29 100755 --- a/scripts/fetchdep.sh +++ b/scripts/fetchdep.sh @@ -11,10 +11,10 @@ rm -r "$defrepo" || true # figure out where to look for pull requests: # - We may have been told an explicit repo via the PR_ORG/PR_REPO/PR_NUMBER env vars # - otherwise, check the $GITHUB_ env vars which are set by Github Actions -# - failing that, fall back to the element-hq/element-web repo. +# - failing that, fall back to the elecordapp/elecord-web repo. # # in ether case, the PR_NUMBER variable must be set explicitly. -default_org_repo=${GITHUB_REPOSITORY:-"element-hq/element-web"} +default_org_repo=${GITHUB_REPOSITORY:-"elecordapp/elecord-web"} PR_ORG=${PR_ORG:-${default_org_repo%%/*}} PR_REPO=${PR_REPO:-${default_org_repo##*/}} diff --git a/scripts/layered.sh b/scripts/layered.sh index 3da209812d7..81d205c5d87 100755 --- a/scripts/layered.sh +++ b/scripts/layered.sh @@ -17,8 +17,8 @@ set -ex yarn install --frozen-lockfile # Pass appropriate repo to fetchdep.sh -export PR_ORG=element-hq -export PR_REPO=element-web +export PR_ORG=elecordapp +export PR_REPO=elecord-web # Set up the js-sdk first scripts/fetchdep.sh matrix-org matrix-js-sdk develop From fbe6b57479575efc3ccd3c68184c1a36ac6148d6 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Wed, 18 Dec 2024 23:41:07 +0000 Subject: [PATCH 4/4] chore(build): switch js-sdk to elecord fork --- scripts/layered.sh | 2 +- src/components/views/dialogs/ChangelogDialog.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/layered.sh b/scripts/layered.sh index 81d205c5d87..7fd5f4bafa7 100755 --- a/scripts/layered.sh +++ b/scripts/layered.sh @@ -21,7 +21,7 @@ export PR_ORG=elecordapp export PR_REPO=elecord-web # Set up the js-sdk first -scripts/fetchdep.sh matrix-org matrix-js-sdk develop +scripts/fetchdep.sh elecordapp matrix-js-sdk develop pushd matrix-js-sdk [ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF yarn link diff --git a/src/components/views/dialogs/ChangelogDialog.tsx b/src/components/views/dialogs/ChangelogDialog.tsx index e97fae8a83c..e15299fc0fe 100644 --- a/src/components/views/dialogs/ChangelogDialog.tsx +++ b/src/components/views/dialogs/ChangelogDialog.tsx @@ -30,7 +30,7 @@ interface Commit { }; } -const REPOS = ["elecordapp/elecord-web", "matrix-org/matrix-js-sdk"] as const; +const REPOS = ["elecordapp/elecord-web", "elecordapp/matrix-js-sdk"] as const; export type DevelopVersionString = string & { _developVersionString: never };