Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream

Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
This commit is contained in:
Claire
2024-01-13 12:11:29 +01:00
64 changed files with 231 additions and 65 deletions

View File

@@ -13,7 +13,7 @@
},
"scripts": {
"start": "node ./index.js",
"check:types": "tsc --noEmit"
"typecheck": "tsc --noEmit"
},
"dependencies": {
"cors": "^2.8.5",

View File

@@ -5,6 +5,7 @@
"module": "CommonJS",
"moduleResolution": "node",
"noUnusedParameters": false,
"tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
"paths": {}
},
"include": ["./*.js", "./.eslintrc.js"]