mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 05:23:14 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '89269e4b71' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream.
This commit is contained in:
Claire 2023-05-09 20:12:33 +02:00
commit 8b568755ad
17 changed files with 163 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tsconfig.json
View file

@ -8,14 +8,17 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"baseUrl": ".",
"baseUrl": "./",
"paths": {
"*": ["app/javascript/*"]
"*": ["app/javascript/*"],
"mastodon": ["app/javascript/mastodon"],
"mastodon/*": ["app/javascript/mastodon/*"]
}
},
"include": [
"app/javascript/mastodon",
"app/javascript/flavours/glitch",
"app/javascript/packs"
"app/javascript/packs",
"app/javascript/types",
"app/javascript/flavours/glitch"
]
}