fix merge conflicts

[github/Chocobozzz/PeerTube.git] / client / tsconfig.json

diff --git a/client/tsconfig.json b/client/tsconfig.json
index d9e798f91ac053363ef367599a17fac75273fc7f..64266d49db000733104030b2f1a4904b8b023638 100644 (file)
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,42 +1,14 @@
+/*
+  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
+  It is not intended to be used to perform a compilation.
+
+  To learn more about this file see: https://angular.io/config/solution-tsconfig.
+*/
 {
-  "compileOnSave": false,
-  "compilerOptions": {
-    "downlevelIteration": true,
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "moduleResolution": "node",
-    "module": "esnext",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "suppressImplicitAnyIndexErrors":true,
-    "alwaysStrict": true,
-    "strictBindCallApply": true,
-    "target": "es2015",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2018",
-      "dom"
-    ],
-    "baseUrl": "./",
-    "paths": {
-      "@app/*": [ "src/app/*" ],
-      "@shared/*": [ "../shared/*" ],
-      "fs": [ "src/shims/noop.ts" ],
-      "http": [ "src/shims/http.ts" ],
-      "https": [ "src/shims/https.ts" ],
-      "path": [ "src/shims/path.ts" ],
-      "stream": [ "src/shims/noop.ts" ],
-      "crypto": [ "src/shims/noop.ts" ]
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
     }
-  },
-  "angularCompilerOptions": {
-    "strictInjectionParameters": true,
-    "fullTemplateTypeCheck": true,
-    "strictTemplates": true
-  }
+  ]
 }