Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
7w1 committed 2026-02-22 14:03:31 -06:00
commit 561a77dce6
12 files changed
+41 -21

No files matched your search

+5 -5
View File
@@ -12,11 +12,11 @@ jobs:
PR_NUMBER: ${{github.event.number}}
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.0
uses: actions/checkout@v6.0.2
- name: Setup node
uses: actions/setup-node@v4.4.0
uses: actions/setup-node@v6.2.0
with:
node-version: 20.12.2
node-version: 24.13.1
cache: 'npm'
- name: Install dependencies
run: npm ci
@@ -25,7 +25,7 @@ jobs:
NODE_OPTIONS: '--max_old_space_size=4096'
run: npm run build
- name: Upload artifact
uses: actions/upload-artifact@v4.6.2
uses: actions/upload-artifact@v6.0.0
with:
name: preview
path: dist
@@ -33,7 +33,7 @@ jobs:
- name: Save pr number
run: echo ${PR_NUMBER} > ./pr.txt
- name: Upload pr number
uses: actions/upload-artifact@v4.6.2
uses: actions/upload-artifact@v6.0.0
with:
name: pr
path: ./pr.txt
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.0
uses: actions/checkout@v6.0.2
- name: Build Docker image
uses: docker/[email protected]
with:
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v4.2.0
uses: actions/checkout@v6.0.2
- name: NPM Lockfile Changes
uses: codepunkt/npm-lockfile-changes@b40543471c36394409466fdb277a73a0856d7891
with:
+3 -3
View File
@@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.0
uses: actions/checkout@v6.0.2
- name: Setup node
uses: actions/setup-node@v4.4.0
uses: actions/setup-node@v6.2.0
with:
node-version: 20.12.2
node-version: 24.13.1
cache: 'npm'
- name: Install dependencies
run: npm ci
+4 -4
View File
@@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.0
uses: actions/checkout@v6.0.2
- name: Setup node
uses: actions/setup-node@v4.4.0
uses: actions/setup-node@v6.2.0
with:
node-version: 20.12.2
node-version: 24.13.1
cache: 'npm'
- name: Install dependencies
run: npm ci
@@ -66,7 +66,7 @@ jobs:
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.0
uses: actions/checkout@v6.0.2
- name: Set up QEMU
uses: docker/[email protected]
- name: Set up Docker Buildx
+2 -2
View File
@@ -1,5 +1,5 @@
## Builder
FROM node:20.12.2-alpine3.18 as builder
FROM node:24.13.1-alpine AS builder
WORKDIR /src
@@ -11,7 +11,7 @@ RUN npm run build
## App
FROM nginx:1.29.3-alpine
FROM nginx:1.29.5-alpine
COPY --from=builder /src/dist /app
COPY --from=builder /src/docker-nginx.conf /etc/nginx/conf.d/default.conf
+1 -1
View File
@@ -83,7 +83,7 @@ mxFo+ioe/ABCufSmyqFye0psX3Sp
## Local development
> [!TIP]
> We recommend using a version manager as versions change very quickly. You will likely need to switch between multiple Node.js versions based on the needs of different projects you're working on. [NVM on windows](https://github.com/coreybutler/nvm-windows#installation--upgrades) on Windows and [nvm](https://github.com/nvm-sh/nvm) on Linux/macOS are pretty good choices. Recommended nodejs version is Iron LTS (v20).
> We recommend using a version manager as versions change very quickly. You will likely need to switch between multiple Node.js versions based on the needs of different projects you're working on. [NVM on windows](https://github.com/coreybutler/nvm-windows#installation--upgrades) on Windows and [nvm](https://github.com/nvm-sh/nvm) on Linux/macOS are pretty good choices. Recommended nodejs version is Krypton LTS (v24.13.1).
Execute the following commands to start a development server:
```sh
+7 -1
View File
@@ -31,7 +31,7 @@
"emojibase-data": "15.3.2",
"file-saver": "2.0.5",
"focus-trap-react": "10.0.2",
"folds": "2.6.0",
"folds": "2.6.1",
"html-dom-parser": "4.0.0",
"html-react-parser": "4.2.0",
"i18next": "23.12.2",
@@ -7448,9 +7448,15 @@
}
},
"node_modules/folds": {
<<<<<<< HEAD
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/folds/-/folds-2.6.0.tgz",
"integrity": "sha512-9353l0KFBptqUXYBJhoZ0ZEs7ofLUeSmcZEtzn23IbAM1SG7R3tTQTk24lcLKJu95qMGxuC3no8MQTQExNHUNw==",
=======
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/folds/-/folds-2.6.1.tgz",
"integrity": "sha512-0L1ZSqwjFSg2fesa//C4DgP47Vp/KqDuzjAaOEYN21AvoptyVI+6OEXWrtIdE8DPQCZYr0bV+tqbrLyA6uAhaw==",
>>>>>>> upstream/dev
"license": "Apache-2.0",
"peerDependencies": {
"@vanilla-extract/css": "1.9.2",
+1 -1
View File
@@ -43,7 +43,7 @@
"emojibase-data": "15.3.2",
"file-saver": "2.0.5",
"focus-trap-react": "10.0.2",
"folds": "2.6.0",
"folds": "2.6.1",
"html-dom-parser": "4.0.0",
"html-react-parser": "4.2.0",
"i18next": "23.12.2",
@@ -190,6 +190,13 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
const otherSettingsGroup: PermissionGroup = {
name: 'Other',
items: [
{
location: {
state: true,
key: StateEvent.PoniesRoomEmotes,
},
name: 'Manage Emojis & Stickers',
},
{
location: {
state: true,
@@ -125,6 +125,13 @@ export const usePermissionGroups = (): PermissionGroup[] => {
const otherSettingsGroup: PermissionGroup = {
name: 'Other',
items: [
{
location: {
state: true,
key: StateEvent.PoniesRoomEmotes,
},
name: 'Manage Emojis & Stickers',
},
{
location: {
state: true,
+2 -2
View File
@@ -18,7 +18,7 @@ export const useSelectedSpace = (): string | undefined => {
export const useSpaceLobbySelected = (spaceIdOrAlias: string): boolean => {
const match = useMatch({
path: getSpaceLobbyPath(spaceIdOrAlias),
path: decodeURIComponent(getSpaceLobbyPath(spaceIdOrAlias)),
caseSensitive: true,
end: false,
});
@@ -28,7 +28,7 @@ export const useSpaceLobbySelected = (spaceIdOrAlias: string): boolean => {
export const useSpaceSearchSelected = (spaceIdOrAlias: string): boolean => {
const match = useMatch({
path: getSpaceSearchPath(spaceIdOrAlias),
path: decodeURIComponent(getSpaceSearchPath(spaceIdOrAlias)),
caseSensitive: true,
end: false,
});