Claire 21e7a53ca5 Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one were changed, but otherwise no real conflict. Ported upstream's changes and kept glitch-soc's `i18n:extract`. - `tsconfig.json`: Upstream's dependencies changed the code style rules for json formatting, and we had local changes. Kept our changes, but with upstream's formatting/ - `yarn.lock`: A dependency textually adjacent to a glitch-soc-only one got changed. Applied upstream's change, keeping the glitch-soc-only dependency.		2024-02-28 20:27:28 +01:00
..
.dockerignore	Dockerfile rewrite based on Ruby image with performance optimizations and size reduction, dedicated Streaming image (#26850)	2023-11-28 10:04:40 +00:00
.eslintrc.cjs	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00
Dockerfile	install "wget" in streaming Dockerfile (#28497)	2023-12-29 10:15:10 +00:00
errors.js	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00
index.js	Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +01:00
logging.js	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00
metrics.js	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00
package.json	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00
tsconfig.json	Update devDependencies (non-major) (#29089)	2024-02-27 16:07:43 +00:00
utils.js	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00