mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
bceb45adda
Conflicts: - `app/javascript/entrypoints/common.js`: Upstream moved everything from `app/javascript/packs` to `app/javascript/entrypoints` while this file was a glitch-soc addition. Moved it like the rest. - `tsconfig.json`: Conflict due to glitch-soc's flavor. Updated like upstream. Also moved and updated the following files accordingly: - `app/javascript/flavours/vanilla/theme.yml` - `app/javascript/flavours/glitch/theme.yml` - everything in `app/javascript/flavours/glitch/packs`
33 lines
942 B
JSON
33 lines
942 B
JSON
{
|
|
"compilerOptions": {
|
|
"jsx": "react-jsx",
|
|
"target": "esnext",
|
|
"module": "CommonJS",
|
|
"moduleResolution": "node",
|
|
"allowJs": true,
|
|
"noEmit": true,
|
|
"strict": true,
|
|
"esModuleInterop": true,
|
|
"skipLibCheck": true,
|
|
"baseUrl": "./",
|
|
"incremental": true,
|
|
"tsBuildInfoFile": "tmp/cache/tsconfig.tsbuildinfo",
|
|
"paths": {
|
|
"locales": ["app/javascript/locales"],
|
|
"styles/*": ["app/javascript/styles/*"],
|
|
"packs/public-path": ["app/javascript/packs/public-path"],
|
|
"flavours/glitch": ["app/javascript/flavours/glitch"],
|
|
"flavours/glitch/*": ["app/javascript/flavours/glitch/*"],
|
|
"mastodon": ["app/javascript/mastodon"],
|
|
"mastodon/*": ["app/javascript/mastodon/*"],
|
|
"@/*": ["app/javascript/*"]
|
|
}
|
|
},
|
|
"include": [
|
|
"app/javascript/mastodon",
|
|
"app/javascript/entrypoints",
|
|
"app/javascript/types",
|
|
"app/javascript/flavours/glitch"
|
|
]
|
|
}
|