21e7a53ca5
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.
34 lines
963 B
JSON
34 lines
963 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/packs",
|
|
"app/javascript/types",
|
|
"app/javascript/flavours/glitch",
|
|
"app/javascript/core"
|
|
]
|
|
}
|