Commit 7d5268b
committed
Merge branch 'develop' into backend-esm-vitest
Brings 150 commits of develop work into the backend ESM + vitest migration
branch (v2.7.3 → v3.0.0 release prep). 41 conflicts resolved, preserving
this branch's ESM structure while layering in develop's new functionality.
Conflict resolution highlights:
- CHANGELOG.md: ESM/vitest plugin-author breaking changes folded into the
v3.0.0 entry as a new "Breaking changes for plugin authors" section.
- src/package.json: kept vitest-only test scripts, dropped mocha/mocha-froth
devDeps, took newer @types/node and etherpad-cli-client versions.
- src/node/db/{API,AuthorManager,DB,GroupManager,Pad}.ts: ESM exports
preserved, develop's new GDPR anonymize/search APIs, deletion-token flow,
ueberdb2 v6, and SYSTEM_AUTHOR_ID added as ESM exports.
- src/node/handler/{APIHandler,PadMessageHandler,RestAPI,SocketIORouter}.ts:
v1.3.1 API surface with compactPad/anonymizeAuthor, prometheus instrument
hooks, anonymizeIp + isAcceptingConnections imports, socketioServer rename
preserved.
- src/node/hooks/express/*: ESM imports, anonymizeIp/ensureAuthorTokenCookie/
socialMeta wired in for v3 features.
- src/node/utils/{Settings,UpdateCheck,ImportEtherpad}.ts: createHash for
randomVersionString determinism, axios dropped in favour of native fetch /
undici, dynamic ueberdb2 import removed (static import works under ESM).
- src/node/server.ts: undici ProxyAgent (axios removal from develop), pkg.json
import with `with { type: 'json' }` ESM attributes.
- src/static/js/{ace,pad,pad_editor,pad_userlist,timeslider}.ts +
pluginfw/installer.ts: full require()→import conversion preserved,
develop's pad_mode/showPrivacyBannerIfEnabled/pad_version_badge/
pluginCatalogGuard/pluginEngineCheck/installerTasks imports added,
pad_editor's focusOnLine settle-loop refactor kept.
- Backend test specs: ESM imports + .js extensions preserved, vitest harness
in src/tests/backend/common.ts kept (with develop's diagnostic loggers
layered in), Settings CJS-compat tests dropped (no longer applicable
under ESM), randomVersionString + padOptions tests converted to ESM.
- Frontend specs: import unions resolved with .js extensions.
- fuzzImportTest.ts: kept deleted (removed earlier in this branch with
mocha-froth).
- .github/workflows/backend-tests.yml: unified single `pnpm test` (vitest)
with develop's Node diagnostic-report capture.
- pnpm-lock.yaml: taken from develop; will need `pnpm install` to reconcile
against the merged package.json (drops mocha/mocha-froth lockfile entries).412 files changed
Lines changed: 57732 additions & 3595 deletions
File tree
- .github/workflows
- admin
- public/ep_admin_authors
- scripts
- __tests__
- src
- api
- __tests__
- components
- settings
- __tests__
- widgets
- localization
- pages
- store
- utils
- bin
- plugins
- lib
- docs/superpowers
- plans
- specs
- doc
- admin
- api
- packaging
- apt
- bin
- scripts
- systemd
- test-fixtures/ep_layout_trip_wire
- snap
- hooks
- local/bin
- tests
- src
- locales
- node
- db
- handler
- hooks
- express
- types
- updater
- utils
- static
- css
- pad
- js
- pluginfw
- types
- vendors
- skins/colibris/src/components
- vendor/scalar
- templates
- tests
- backend-new/specs
- privacy
- updater
- backend
- specs
- admin
- api
- fixtures
- frontend-new
- admin-spec
- helper
- specs
- frontend/specs
- ratelimit
- ui
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | | - | |
| 30 | + | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
47 | 46 | | |
48 | 47 | | |
49 | 48 | | |
| |||
67 | 66 | | |
68 | 67 | | |
69 | 68 | | |
70 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
71 | 87 | | |
72 | 88 | | |
73 | 89 | | |
| |||
82 | 98 | | |
83 | 99 | | |
84 | 100 | | |
85 | | - | |
| 101 | + | |
86 | 102 | | |
87 | 103 | | |
88 | 104 | | |
| |||
97 | 113 | | |
98 | 114 | | |
99 | 115 | | |
100 | | - | |
101 | 116 | | |
102 | 117 | | |
103 | 118 | | |
| |||
123 | 138 | | |
124 | 139 | | |
125 | 140 | | |
| 141 | + | |
126 | 142 | | |
| 143 | + | |
127 | 144 | | |
128 | 145 | | |
129 | 146 | | |
| |||
133 | 150 | | |
134 | 151 | | |
135 | 152 | | |
136 | | - | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
137 | 166 | | |
138 | 167 | | |
139 | 168 | | |
| |||
144 | 173 | | |
145 | 174 | | |
146 | 175 | | |
147 | | - | |
| 176 | + | |
| 177 | + | |
148 | 178 | | |
149 | 179 | | |
150 | 180 | | |
| |||
161 | 191 | | |
162 | 192 | | |
163 | 193 | | |
164 | | - | |
165 | 194 | | |
166 | 195 | | |
167 | 196 | | |
| |||
181 | 210 | | |
182 | 211 | | |
183 | 212 | | |
| 213 | + | |
184 | 214 | | |
185 | | - | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
186 | 228 | | |
187 | 229 | | |
188 | 230 | | |
| |||
192 | 234 | | |
193 | 235 | | |
194 | 236 | | |
195 | | - | |
| 237 | + | |
| 238 | + | |
196 | 239 | | |
197 | 240 | | |
198 | 241 | | |
| |||
210 | 253 | | |
211 | 254 | | |
212 | 255 | | |
213 | | - | |
214 | 256 | | |
215 | 257 | | |
216 | 258 | | |
| |||
229 | 271 | | |
230 | 272 | | |
231 | 273 | | |
| 274 | + | |
232 | 275 | | |
| 276 | + | |
233 | 277 | | |
234 | 278 | | |
235 | 279 | | |
| |||
256 | 300 | | |
257 | 301 | | |
258 | 302 | | |
| 303 | + | |
259 | 304 | | |
260 | | - | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
2 | 7 | | |
3 | 8 | | |
4 | 9 | | |
5 | | - | |
6 | 10 | | |
7 | 11 | | |
8 | 12 | | |
9 | | - | |
10 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
11 | 19 | | |
12 | 20 | | |
13 | | - | |
14 | 21 | | |
15 | 22 | | |
16 | 23 | | |
17 | 24 | | |
18 | 25 | | |
19 | 26 | | |
20 | | - | |
21 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
22 | 30 | | |
23 | 31 | | |
24 | 32 | | |
25 | 33 | | |
26 | 34 | | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
| 35 | + | |
32 | 36 | | |
33 | 37 | | |
34 | 38 | | |
| |||
50 | 54 | | |
51 | 55 | | |
52 | 56 | | |
53 | | - | |
54 | 57 | | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
55 | 65 | | |
| 66 | + | |
56 | 67 | | |
57 | 68 | | |
58 | 69 | | |
59 | 70 | | |
60 | 71 | | |
61 | 72 | | |
62 | 73 | | |
| 74 | + | |
63 | 75 | | |
64 | 76 | | |
| 77 | + | |
65 | 78 | | |
66 | 79 | | |
67 | | - | |
68 | 80 | | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
69 | 94 | | |
70 | 95 | | |
71 | 96 | | |
0 commit comments