Skip to content

Commit 523b5b5

Browse files
SamTV12345SamTV12345
committed
Merge branch 'develop'
2 parents c45b7a3 + 8a9bda7 commit 523b5b5

36 files changed

+1564
-1887
lines changed

‎.github/workflows/backend-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
node: [18, 20, 21]
27+
node: [18, 20, 22]
2828
steps:
2929
-
3030
name: Checkout repository
@@ -81,7 +81,7 @@ jobs:
8181
strategy:
8282
fail-fast: false
8383
matrix:
84-
node: [18, 20, 21]
84+
node: [18, 20, 22]
8585
steps:
8686
-
8787
name: Checkout repository
@@ -211,7 +211,7 @@ jobs:
211211
-
212212
uses: actions/setup-node@v4
213213
with:
214-
node-version: 21
214+
node-version: 22
215215
- uses: pnpm/action-setup@v4
216216
name: Install pnpm
217217
with:

‎.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: docker/setup-buildx-action@v3
3232
-
3333
name: Build and export to Docker
34-
uses: docker/build-push-action@v5
34+
uses: docker/build-push-action@v6
3535
with:
3636
context: .
3737
target: production
@@ -99,7 +99,7 @@ jobs:
9999
-
100100
name: Build and push
101101
if: github.event_name == 'push'
102-
uses: docker/build-push-action@v5
102+
uses: docker/build-push-action@v6
103103
with:
104104
context: .
105105
target: production

‎.github/workflows/frontend-admin-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ permissions:
1111

1212
jobs:
1313
withplugins:
14-
if: ${{ github.actor != 'dependabot[bot]' }}
1514
name: with plugins
1615
runs-on: ubuntu-latest
1716

1817
strategy:
1918
fail-fast: false
2019
matrix:
21-
node: [20, 21]
20+
node: [20, 22]
2221

2322
steps:
2423
-

‎.github/workflows/frontend-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
-
2727
uses: actions/setup-node@v4
2828
with:
29-
node-version: 21
29+
node-version: 22
3030
- uses: pnpm/action-setup@v4
3131
name: Install pnpm
3232
with:
@@ -92,7 +92,7 @@ jobs:
9292
uses: actions/checkout@v4
9393
- uses: actions/setup-node@v4
9494
with:
95-
node-version: 21
95+
node-version: 22
9696
- uses: pnpm/action-setup@v4
9797
name: Install pnpm
9898
with:
@@ -159,7 +159,7 @@ jobs:
159159
-
160160
uses: actions/setup-node@v4
161161
with:
162-
node-version: 21
162+
node-version: 22
163163
- uses: pnpm/action-setup@v4
164164
name: Install pnpm
165165
with:

‎.github/workflows/rate-limit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
4949
-
5050
name: docker network
51-
run: docker network create --subnet=172.23.42.0/16 ep_net
51+
run: docker network create --subnet=172.23.0.0/16 ep_net
5252
-
5353
name: build docker image
5454
run: |

‎.github/workflows/upgrade-from-latest-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
node: [18, 20, 21]
27+
node: [18, 20, 22]
2828
steps:
2929
-
3030
name: Check out latest release
3131
uses: actions/checkout@v4
3232
with:
33-
ref: master
33+
ref: develop #FIXME change to master when doing release
3434
-
3535
uses: actions/setup-node@v4
3636
with:

‎.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
-
3535
uses: actions/setup-node@v4
3636
with:
37-
node-version: 21
37+
node-version: 22
3838
- uses: pnpm/action-setup@v4
3939
name: Install pnpm
4040
with:

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# 2.1.1
2+
3+
4+
### Notable enhancements and fixes
5+
6+
- Fixed failing Docker build when checked out as git submodule. Thanks to @neurolabs
7+
- Fixed: Fallback to websocket and polling when unknown(old) config is present for socket io
8+
- Fixed: Next page disabled if zero page by @samyakj023
9+
- On CTRL+CLICK bring the window back to focus by Helder Sepulveda
10+
111
# 2.1.0
212

313
### Notable enhancements and fixes

‎Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#
55
# Author: muxator
66

7-
FROM node:alpine as adminBuild
7+
FROM node:alpine AS adminbuild
88

99
WORKDIR /opt/etherpad-lite
1010
COPY ./ ./
1111
RUN cd ./admin && npm install -g [email protected] && pnpm install && pnpm run build --outDir ./dist
1212
RUN cd ./ui && pnpm install && pnpm run build --outDir ./dist
1313

1414

15-
FROM node:alpine as build
15+
FROM node:alpine AS build
1616
LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
1717

1818
# Set these arguments when building the image from behind a proxy
@@ -105,33 +105,33 @@ USER etherpad
105105
WORKDIR "${EP_DIR}"
106106

107107
# etherpads version feature requires this. Only copy what is really needed
108-
COPY --chown=etherpad:etherpad ./.git/HEAD ./.git/HEAD
109-
COPY --chown=etherpad:etherpad ./.git/refs ./.git/refs
108+
COPY --chown=etherpad:etherpad ./.git/HEA[D] ./.git/HEAD
109+
COPY --chown=etherpad:etherpad ./.git/ref[s] ./.git/refs
110110
COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
111111
COPY --chown=etherpad:etherpad ./var ./var
112112
COPY --chown=etherpad:etherpad ./bin ./bin
113113
COPY --chown=etherpad:etherpad ./pnpm-workspace.yaml ./package.json ./
114114

115-
FROM build as development
115+
FROM build AS development
116116

117117
COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/
118-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/admin/dist ./src/templates/admin
119-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/ui/dist ./src/static/oidc
118+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/admin/dist ./src/templates/admin
119+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/ui/dist ./src/static/oidc
120120

121121
RUN bin/installDeps.sh && \
122122
if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \
123123
pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}}; \
124124
fi
125125

126126

127-
FROM build as production
127+
FROM build AS production
128128

129129
ENV NODE_ENV=production
130130
ENV ETHERPAD_PRODUCTION=true
131131

132132
COPY --chown=etherpad:etherpad ./src ./src
133-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/admin/dist ./src/templates/admin
134-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/ui/dist ./src/static/oidc
133+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/admin/dist ./src/templates/admin
134+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/ui/dist ./src/static/oidc
135135

136136
RUN bin/installDeps.sh && rm -rf ~/.npm && rm -rf ~/.local && rm -rf ~/.cache && \
137137
if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \

‎admin/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "admin",
33
"private": true,
4-
"version": "2.1.0",
4+
"version": "2.1.1",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
@@ -11,32 +11,32 @@
1111
"preview": "vite preview"
1212
},
1313
"dependencies": {
14-
"@radix-ui/react-switch": "^1.0.3"
14+
"@radix-ui/react-switch": "^1.1.0"
1515
},
1616
"devDependencies": {
17-
"@radix-ui/react-dialog": "^1.0.5",
18-
"@radix-ui/react-toast": "^1.1.5",
17+
"@radix-ui/react-dialog": "^1.1.1",
18+
"@radix-ui/react-toast": "^1.2.1",
1919
"@types/react": "^18.3.2",
2020
"@types/react-dom": "^18.2.25",
21-
"@typescript-eslint/eslint-plugin": "^7.11.0",
22-
"@typescript-eslint/parser": "^7.11.0",
21+
"@typescript-eslint/eslint-plugin": "^7.15.0",
22+
"@typescript-eslint/parser": "^7.15.0",
2323
"@vitejs/plugin-react-swc": "^3.5.0",
24-
"eslint": "^9.2.0",
24+
"eslint": "^9.6.0",
2525
"eslint-plugin-react-hooks": "^4.6.0",
2626
"eslint-plugin-react-refresh": "^0.4.7",
2727
"i18next": "^23.11.5",
2828
"i18next-browser-languagedetector": "^8.0.0",
29-
"lucide-react": "^0.381.0",
29+
"lucide-react": "^0.400.0",
3030
"react": "^18.2.0",
3131
"react-dom": "^18.2.0",
32-
"react-hook-form": "^7.51.5",
32+
"react-hook-form": "^7.52.1",
3333
"react-i18next": "^14.1.0",
34-
"react-router-dom": "^6.23.1",
34+
"react-router-dom": "^6.24.1",
3535
"socket.io-client": "^4.7.5",
36-
"typescript": "^5.4.5",
37-
"vite": "^5.2.12",
38-
"vite-plugin-static-copy": "^1.0.3",
36+
"typescript": "^5.5.3",
37+
"vite": "^5.3.3",
38+
"vite-plugin-static-copy": "^1.0.6",
3939
"vite-plugin-svgr": "^4.2.0",
40-
"zustand": "^4.5.2"
40+
"zustand": "^4.5.4"
4141
}
4242
}

0 commit comments

Comments
 (0)