aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/angular.json6
-rw-r--r--client/e2e/tsconfig.e2e.json4
-rw-r--r--client/package.json2
-rw-r--r--client/tsconfig.app.json26
-rw-r--r--client/tsconfig.base.json49
-rw-r--r--client/tsconfig.json72
-rw-r--r--client/webpack/webpack.video-embed.js2
7 files changed, 68 insertions, 93 deletions
diff --git a/client/angular.json b/client/angular.json
index 251161579..60a630c89 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -135,7 +135,7 @@
135 "outputPath": "dist", 135 "outputPath": "dist",
136 "index": "src/index.html", 136 "index": "src/index.html",
137 "main": "src/main.ts", 137 "main": "src/main.ts",
138 "tsConfig": "tsconfig.app.json", 138 "tsConfig": "tsconfig.json",
139 "polyfills": "src/polyfills.ts", 139 "polyfills": "src/polyfills.ts",
140 "baseHref": "/", 140 "baseHref": "/",
141 "deployUrl": "", 141 "deployUrl": "",
@@ -158,7 +158,7 @@
158 "markdown-it-emoji/light", 158 "markdown-it-emoji/light",
159 "sanitize-html", 159 "sanitize-html",
160 "debug", 160 "debug",
161 "p2p-media-loader-hlsjs", 161 "@peertube/p2p-media-loader-hlsjs",
162 "video.js", 162 "video.js",
163 "sha.js/sha1", 163 "sha.js/sha1",
164 "postcss", 164 "postcss",
@@ -298,7 +298,7 @@
298 "builder": "@angular-devkit/build-angular:tslint", 298 "builder": "@angular-devkit/build-angular:tslint",
299 "options": { 299 "options": {
300 "tsConfig": [ 300 "tsConfig": [
301 "tsconfig.app.json" 301 "tsconfig.json"
302 ], 302 ],
303 "exclude": [ 303 "exclude": [
304 "**/node_modules/**" 304 "**/node_modules/**"
diff --git a/client/e2e/tsconfig.e2e.json b/client/e2e/tsconfig.e2e.json
index 415179b48..77d311e88 100644
--- a/client/e2e/tsconfig.e2e.json
+++ b/client/e2e/tsconfig.e2e.json
@@ -1,5 +1,5 @@
1{ 1{
2 "extends": "../tsconfig.base.json", 2 "extends": "../tsconfig.json",
3 "compilerOptions": { 3 "compilerOptions": {
4 "outDir": "../out-tsc/app", 4 "outDir": "../out-tsc/app",
5 "module": "commonjs", 5 "module": "commonjs",
@@ -10,4 +10,4 @@
10 "node" 10 "node"
11 ] 11 ]
12 } 12 }
13} \ No newline at end of file 13}
diff --git a/client/package.json b/client/package.json
index e74cbea5b..6a9529cf6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -14,7 +14,7 @@
14 }, 14 },
15 "scripts": { 15 "scripts": {
16 "lint": "npm run lint-ts && npm run lint-scss", 16 "lint": "npm run lint-ts && npm run lint-scss",
17 "lint-ts": "tslint --project ./tsconfig.app.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'", 17 "lint-ts": "tslint --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'",
18 "lint-scss": "stylelint 'src/**/*.scss'", 18 "lint-scss": "stylelint 'src/**/*.scss'",
19 "webpack": "webpack", 19 "webpack": "webpack",
20 "tslint": "tslint", 20 "tslint": "tslint",
diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json
deleted file mode 100644
index ac7a1fb36..000000000
--- a/client/tsconfig.app.json
+++ /dev/null
@@ -1,26 +0,0 @@
1{
2 "extends": "./tsconfig.base.json",
3 "compilerOptions": {
4 "outDir": "./out-tsc/app",
5 "baseUrl": "./",
6 "types": [],
7 "lib": [
8 "es2017",
9 "es2016",
10 "es2015",
11 "dom"
12 ]
13 },
14 "files": [
15 "src/polyfills.ts"
16 ],
17 "include": [
18 "src/main*.ts",
19 "src/**/*.d.ts",
20 "src/shims/*.ts"
21 ],
22 "exclude": [
23 "../node_modules",
24 "../server"
25 ]
26}
diff --git a/client/tsconfig.base.json b/client/tsconfig.base.json
deleted file mode 100644
index fd297e60a..000000000
--- a/client/tsconfig.base.json
+++ /dev/null
@@ -1,49 +0,0 @@
1{
2 "compileOnSave": false,
3 "compilerOptions": {
4 "downlevelIteration": true,
5 "outDir": "./dist/out-tsc",
6 "sourceMap": true,
7 "declaration": false,
8 "moduleResolution": "node",
9 "module": "esnext",
10 "experimentalDecorators": true,
11 "noImplicitAny": true,
12 "noImplicitThis": true,
13 "suppressImplicitAnyIndexErrors":true,
14 "alwaysStrict": true,
15 "importHelpers": true,
16 "strictBindCallApply": true,
17 "target": "es2015",
18 "typeRoots": [
19 "node_modules/@types"
20 ],
21 "lib": [
22 "es2018",
23 "dom"
24 ],
25 "baseUrl": "./",
26 "paths": {
27 "hls.js": [ "node_modules/hls.js/dist/hls.light" ],
28 "video.js": [ "node_modules/video.js/core" ],
29 "@app/*": [ "src/app/*" ],
30 "@shared/models/*": [ "../shared/models/*" ],
31 "@shared/models": [ "../shared/models" ],
32 "@shared/core-utils": [ "../shared/core-utils" ],
33 "@shared/core-utils/*": [ "../shared/core-utils/*" ],
34 "@root-helpers/*": [ "src/root-helpers/*" ],
35 "fs": [ "src/shims/noop.ts" ],
36 "http": [ "src/shims/http.ts" ],
37 "https": [ "src/shims/https.ts" ],
38 "path": [ "src/shims/path.ts" ],
39 "stream": [ "src/shims/stream.ts" ],
40 "crypto": [ "src/shims/noop.ts" ]
41 }
42 },
43 "angularCompilerOptions": {
44 "strictInjectionParameters": true,
45 "fullTemplateTypeCheck": true,
46 "strictTemplates": true,
47 "enableI18nLegacyMessageIdFormat": false
48 }
49}
diff --git a/client/tsconfig.json b/client/tsconfig.json
index 64266d49d..fdf4dc777 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,14 +1,64 @@
1/*
2 This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3 It is not intended to be used to perform a compilation.
4
5 To learn more about this file see: https://angular.io/config/solution-tsconfig.
6*/
7{ 1{
8 "files": [], 2 "compileOnSave": false,
9 "references": [ 3 "compilerOptions": {
10 { 4 "downlevelIteration": true,
11 "path": "./tsconfig.app.json" 5 "outDir": "./dist/out-tsc",
6 "sourceMap": true,
7 "declaration": false,
8 "moduleResolution": "node",
9 "module": "esnext",
10 "experimentalDecorators": true,
11 "noImplicitAny": true,
12 "noImplicitThis": true,
13 "suppressImplicitAnyIndexErrors":true,
14 "alwaysStrict": true,
15 "importHelpers": true,
16 "strictBindCallApply": true,
17 "target": "es2015",
18 "typeRoots": [
19 "node_modules/@types"
20 ],
21 "lib": [
22 "es2018",
23 "es2017",
24 "es2016",
25 "es2015",
26 "dom"
27 ],
28 "baseUrl": "./",
29 "paths": {
30 "hls.js": [ "node_modules/hls.js/dist/hls.light" ],
31 "video.js": [ "node_modules/video.js/core" ],
32 "@app/*": [ "src/app/*" ],
33 "@shared/models/*": [ "../shared/models/*" ],
34 "@shared/models": [ "../shared/models" ],
35 "@shared/core-utils": [ "../shared/core-utils" ],
36 "@shared/core-utils/*": [ "../shared/core-utils/*" ],
37 "@root-helpers/*": [ "src/root-helpers/*" ],
38 "fs": [ "src/shims/noop.ts" ],
39 "http": [ "src/shims/http.ts" ],
40 "https": [ "src/shims/https.ts" ],
41 "path": [ "src/shims/path.ts" ],
42 "stream": [ "src/shims/stream.ts" ],
43 "crypto": [ "src/shims/noop.ts" ]
12 } 44 }
13 ] 45 },
46 "files": [
47 "src/polyfills.ts"
48 ],
49 "include": [
50 "src/main*.ts",
51 "src/**/*.d.ts",
52 "src/shims/*.ts"
53 ],
54 "exclude": [
55 "../node_modules",
56 "../server"
57 ],
58 "angularCompilerOptions": {
59 "strictInjectionParameters": true,
60 "fullTemplateTypeCheck": true,
61 "strictTemplates": true,
62 "enableI18nLegacyMessageIdFormat": false
63 }
14} 64}
diff --git a/client/webpack/webpack.video-embed.js b/client/webpack/webpack.video-embed.js
index 727249467..2ecbd09af 100644
--- a/client/webpack/webpack.video-embed.js
+++ b/client/webpack/webpack.video-embed.js
@@ -70,7 +70,7 @@ module.exports = function () {
70 { 70 {
71 loader: 'ts-loader', 71 loader: 'ts-loader',
72 options: { 72 options: {
73 configFile: 'tsconfig.base.json' 73 configFile: 'tsconfig.json'
74 } 74 }
75 } 75 }
76 ] 76 ]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 23:58:57 +0000