From: Chocobozzz Date: Tue, 17 Aug 2021 12:01:51 +0000 (+0200) Subject: Remove solution style ts config X-Git-Tag: v3.4.0-rc.1~108 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1d4591fd9c724c9409da31612f6d8c008f1cb5e4;p=github%2FChocobozzz%2FPeerTube.git Remove solution style ts config --- 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 @@ "outputPath": "dist", "index": "src/index.html", "main": "src/main.ts", - "tsConfig": "tsconfig.app.json", + "tsConfig": "tsconfig.json", "polyfills": "src/polyfills.ts", "baseHref": "/", "deployUrl": "", @@ -158,7 +158,7 @@ "markdown-it-emoji/light", "sanitize-html", "debug", - "p2p-media-loader-hlsjs", + "@peertube/p2p-media-loader-hlsjs", "video.js", "sha.js/sha1", "postcss", @@ -298,7 +298,7 @@ "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": [ - "tsconfig.app.json" + "tsconfig.json" ], "exclude": [ "**/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 @@ { - "extends": "../tsconfig.base.json", + "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", "module": "commonjs", @@ -10,4 +10,4 @@ "node" ] } -} \ No newline at end of file +} 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 @@ }, "scripts": { "lint": "npm run lint-ts && npm run lint-scss", - "lint-ts": "tslint --project ./tsconfig.app.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'", + "lint-ts": "tslint --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'", "lint-scss": "stylelint 'src/**/*.scss'", "webpack": "webpack", "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 @@ -{ - "extends": "./tsconfig.base.json", - "compilerOptions": { - "outDir": "./out-tsc/app", - "baseUrl": "./", - "types": [], - "lib": [ - "es2017", - "es2016", - "es2015", - "dom" - ] - }, - "files": [ - "src/polyfills.ts" - ], - "include": [ - "src/main*.ts", - "src/**/*.d.ts", - "src/shims/*.ts" - ], - "exclude": [ - "../node_modules", - "../server" - ] -} 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 @@ -{ - "compileOnSave": false, - "compilerOptions": { - "downlevelIteration": true, - "outDir": "./dist/out-tsc", - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "module": "esnext", - "experimentalDecorators": true, - "noImplicitAny": true, - "noImplicitThis": true, - "suppressImplicitAnyIndexErrors":true, - "alwaysStrict": true, - "importHelpers": true, - "strictBindCallApply": true, - "target": "es2015", - "typeRoots": [ - "node_modules/@types" - ], - "lib": [ - "es2018", - "dom" - ], - "baseUrl": "./", - "paths": { - "hls.js": [ "node_modules/hls.js/dist/hls.light" ], - "video.js": [ "node_modules/video.js/core" ], - "@app/*": [ "src/app/*" ], - "@shared/models/*": [ "../shared/models/*" ], - "@shared/models": [ "../shared/models" ], - "@shared/core-utils": [ "../shared/core-utils" ], - "@shared/core-utils/*": [ "../shared/core-utils/*" ], - "@root-helpers/*": [ "src/root-helpers/*" ], - "fs": [ "src/shims/noop.ts" ], - "http": [ "src/shims/http.ts" ], - "https": [ "src/shims/https.ts" ], - "path": [ "src/shims/path.ts" ], - "stream": [ "src/shims/stream.ts" ], - "crypto": [ "src/shims/noop.ts" ] - } - }, - "angularCompilerOptions": { - "strictInjectionParameters": true, - "fullTemplateTypeCheck": true, - "strictTemplates": true, - "enableI18nLegacyMessageIdFormat": false - } -} 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 @@ -/* - 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. -*/ { - "files": [], - "references": [ - { - "path": "./tsconfig.app.json" + "compileOnSave": false, + "compilerOptions": { + "downlevelIteration": true, + "outDir": "./dist/out-tsc", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "module": "esnext", + "experimentalDecorators": true, + "noImplicitAny": true, + "noImplicitThis": true, + "suppressImplicitAnyIndexErrors":true, + "alwaysStrict": true, + "importHelpers": true, + "strictBindCallApply": true, + "target": "es2015", + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2018", + "es2017", + "es2016", + "es2015", + "dom" + ], + "baseUrl": "./", + "paths": { + "hls.js": [ "node_modules/hls.js/dist/hls.light" ], + "video.js": [ "node_modules/video.js/core" ], + "@app/*": [ "src/app/*" ], + "@shared/models/*": [ "../shared/models/*" ], + "@shared/models": [ "../shared/models" ], + "@shared/core-utils": [ "../shared/core-utils" ], + "@shared/core-utils/*": [ "../shared/core-utils/*" ], + "@root-helpers/*": [ "src/root-helpers/*" ], + "fs": [ "src/shims/noop.ts" ], + "http": [ "src/shims/http.ts" ], + "https": [ "src/shims/https.ts" ], + "path": [ "src/shims/path.ts" ], + "stream": [ "src/shims/stream.ts" ], + "crypto": [ "src/shims/noop.ts" ] } - ] + }, + "files": [ + "src/polyfills.ts" + ], + "include": [ + "src/main*.ts", + "src/**/*.d.ts", + "src/shims/*.ts" + ], + "exclude": [ + "../node_modules", + "../server" + ], + "angularCompilerOptions": { + "strictInjectionParameters": true, + "fullTemplateTypeCheck": true, + "strictTemplates": true, + "enableI18nLegacyMessageIdFormat": false + } } 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 () { { loader: 'ts-loader', options: { - configFile: 'tsconfig.base.json' + configFile: 'tsconfig.json' } } ]