Skip to content

Commit

Permalink
ci: use shareable @taiga-ui/tsconfig (#711)
Browse files Browse the repository at this point in the history
  • Loading branch information
nsbarsukov authored Dec 4, 2023
1 parent 34ffdd3 commit 3ea38d9
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 698 deletions.
708 changes: 80 additions & 628 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@
"@taiga-ui/eslint-plugin-experience": "0.39.3",
"@taiga-ui/prettier-config": "0.6.0",
"@taiga-ui/stylelint-config": "0.10.0",
"@taiga-ui/tsconfig": "0.9.0",
"@tinkoff/eslint-config": "2.0.0",
"@tinkoff/eslint-config-react": "2.0.0",
"@types/estree": "1.0.5",
"@types/jest": "28.1.8",
"@types/jest": "29.5.10",
"@types/node": "20.10.1",
"babel-jest": "29.7.0",
"cspell": "8.0.0",
Expand Down
3 changes: 1 addition & 2 deletions projects/demo/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import 'zone.js/node';
import {APP_BASE_HREF} from '@angular/common';
import {provideLocation, provideUserAgent} from '@ng-web-apis/universal';
import {ngExpressEngine} from '@nguniversal/express-engine';
import * as express from 'express';
import {Express} from 'express';
import express, {Express} from 'express';
import {existsSync} from 'fs';
import {join} from 'path';

Expand Down
3 changes: 3 additions & 0 deletions projects/demo/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"compilerOptions": {
"outDir": "../out-tsc/app"
},
"angularCompilerOptions": {
"compilationMode": "full"
},
"files": ["./src/typings.d.ts", "./src/main.browser.ts", "./src/polyfills.ts"]
}
3 changes: 2 additions & 1 deletion projects/demo/tsconfig.server.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
},
"files": ["src/typings.d.ts", "src/main.server.ts", "server.ts"],
"angularCompilerOptions": {
"entryModule": "./src/app/app.server.module#AppServerModule"
"entryModule": "./src/app/app.server.module#AppServerModule",
"compilationMode": "full"
}
}
58 changes: 0 additions & 58 deletions tsconfig.base.json

This file was deleted.

3 changes: 1 addition & 2 deletions tsconfig.eslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"compilerOptions": {
"rootDir": ".",
"baseUrl": ".",
"strict": false,
"incremental": true
"strict": false
},
"include": ["projects", "scripts"],
"exclude": ["**/node_modules", "**/schematics/**", "**/.*/", "*.js"]
Expand Down
29 changes: 25 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
// TODO after update all "@nrwl/*"-packages to 13.8.6+:
// 1. Drop this file
// 2. Rename "tsconfig.base.json" => "tsconfig.json"
{
"extends": "./tsconfig.base.json"
"extends": "@taiga-ui/tsconfig",
"exclude": ["projects/demo-integrations"],
"angularCompilerOptions": {
"strictTemplates": true
},
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"typeRoots": ["node_modules/@types", "node_modules/@taiga-ui/tsconfig/@types"],
"sourceMap": true,
"module": "es2020",
"jsx": "react-jsx",
"target": "es2015",
"lib": ["es2017", "es2018.asynciterable", "dom"],
"checkJs": false,
"paths": {
"@demo/constants": ["projects/demo/src/app/constants/index.ts"],
"@maskito/angular": ["projects/angular/src/index.ts"],
"@maskito/core": ["projects/core/src/index.ts"],
"@maskito/kit": ["projects/kit/src/index.ts"],
"@maskito/phone": ["projects/phone/src/index.ts"],
"@maskito/react": ["projects/react/src/index.ts"],
"@maskito/vue": ["projects/vue/src/index.ts"]
}
}
}
3 changes: 1 addition & 2 deletions tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"compilerOptions": {
"outDir": "./out-tsc/spec",
"module": "esnext",
"types": ["jest", "node"],
"esModuleInterop": true
"types": ["jest", "node"]
},
"exclude": ["**/schematics/**/*", "projects/demo-integrations"],
"include": ["**/*.spec.ts", "**/*.d.ts", "**/*.spec.tsx"]
Expand Down

0 comments on commit 3ea38d9

Please sign in to comment.