Skip to content

Commit

Permalink
feat!: update to Angular 11 (#2097)
Browse files Browse the repository at this point in the history
* feat!: update to Angular 11

* refactor: after review fix
  • Loading branch information
nsbarsukov authored and splincode committed Aug 30, 2022
1 parent 9bc7a08 commit a698286
Show file tree
Hide file tree
Showing 36 changed files with 190 additions and 170 deletions.
34 changes: 16 additions & 18 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-charts"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -54,7 +54,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-commerce"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -96,7 +96,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-doc"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -145,7 +145,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-editor"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -187,7 +187,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-mobile"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -229,7 +229,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-preview"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -270,7 +270,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-table"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -312,7 +312,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/addon-tablebars"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -354,7 +354,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"prebuild": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "tsconfig.build.json",
"project": "projects/cdk/ng-package.json"
Expand Down Expand Up @@ -434,7 +434,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/core"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -543,7 +543,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": false,
Expand Down Expand Up @@ -571,7 +570,6 @@
"outputPath": "dist/demo/browser/next",
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": false,
Expand Down Expand Up @@ -748,7 +746,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/i18n"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -795,7 +793,7 @@
]
},
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/icons"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -824,7 +822,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/kit"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down Expand Up @@ -865,7 +863,7 @@
"implicitDependencies": ["!testing"],
"architect": {
"prebuild": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "tsconfig.build.json",
"project": "projects/taiga-schematics/ng-package.json"
Expand Down Expand Up @@ -901,7 +899,7 @@
"options": {
"parallel": false,
"commands": [
"tsc -p ./projects/taiga-schematics/tsconfig.spec.json",
"tsc -p ./projects/taiga-schematics/tsconfig.spec.json --tsBuildInfoFile null",
"jasmine ./dist/taiga-schematics/**/*.spec.js"
]
},
Expand All @@ -928,7 +926,7 @@
"implicitDependencies": ["cdk"],
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"outputs": ["dist/testing"],
"options": {
"tsConfig": "tsconfig.build.json",
Expand Down
39 changes: 19 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"*** CI ***": "",
"affected:test:libs": "nx affected --target test --parallel --exclude=demo",
"affected:build:libs": "nx affected --target build --parallel --exclude=demo",
"run-many:test:libs": "nx run-many --target test --all --parallel --exclude=demo",
"run-many:build:libs": "nx run-many --target build --parallel --all --exclude=demo",
"run-many:test:libs": "nx run-many --target test --all --exclude=demo",
"run-many:build:libs": "nx run-many --target build --all --exclude=demo",
"run-many:publish:libs": "nx run-many --target publish --all"
},
"lint-staged": {
Expand All @@ -62,30 +62,29 @@
]
},
"dependencies": {
"@angular/animations": "~10.2.5",
"@angular/cdk": "~9.2.4",
"@angular/common": "~10.2.5",
"@angular/compiler": "~10.2.5",
"@angular/core": "~10.2.5",
"@angular/forms": "~10.2.5",
"@angular/localize": "^10.2.5",
"@angular/platform-browser": "~10.2.5",
"@angular/platform-browser-dynamic": "~10.2.5",
"@angular/platform-server": "^10.2.5",
"@angular/router": "~10.2.5",
"@angular/animations": "~11.2.14",
"@angular/cdk": "~11.2.13",
"@angular/common": "~11.2.14",
"@angular/compiler": "~11.2.14",
"@angular/core": "~11.2.14",
"@angular/forms": "~11.2.14",
"@angular/localize": "^11.2.14",
"@angular/platform-browser": "~11.2.14",
"@angular/platform-browser-dynamic": "~11.2.14",
"@angular/platform-server": "^11.2.14",
"@angular/router": "~11.2.14",
"core-js": "^2.6.9",
"parse5": "^6.0.1",
"rxjs": "~6.6.3",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.4",
"@angular-devkit/build-ng-packagr": "~0.1002.4",
"@angular-devkit/core": "~10.2.4",
"@angular/cli": "~10.2.4",
"@angular/compiler-cli": "~10.2.5",
"@angular/language-service": "~10.2.5",
"@angular-devkit/build-angular": "~0.1102.19",
"@angular-devkit/core": "~11.2.19",
"@angular/cli": "~11.2.19",
"@angular/compiler-cli": "~11.2.14",
"@angular/language-service": "~11.2.14",
"@commitlint/cli": "^17.0.2",
"@commitlint/config-conventional": "^17.0.2",
"@nrwl/cli": "14.5.7",
Expand Down Expand Up @@ -114,7 +113,7 @@
"husky": "^8.0.1",
"kill-port": "^2.0.0",
"lint-staged": "^8.2.1",
"ng-packagr": "^10.1.0",
"ng-packagr": "^11.2.4",
"postcss": "^8.4.14",
"prettier": "~2.7.1",
"raw-loader": "^4.0.2",
Expand Down
8 changes: 4 additions & 4 deletions projects/addon-charts/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"allowedNonPeerDependencies": [
"."
],
"dest": "../../dist/addon-charts",
"lib": {
"entryFile": "index.ts",
"styleIncludePaths": [
"../core/styles"
]
},
"whitelistedNonPeerDependencies": [
"."
]
}
}
8 changes: 4 additions & 4 deletions projects/addon-commerce/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"allowedNonPeerDependencies": [
"."
],
"dest": "../../dist/addon-commerce",
"lib": {
"entryFile": "index.ts",
"styleIncludePaths": [
"../core/styles"
]
},
"whitelistedNonPeerDependencies": [
"."
]
}
}
8 changes: 4 additions & 4 deletions projects/addon-doc/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"allowedNonPeerDependencies": [
"."
],
"dest": "../../dist/addon-doc",
"lib": {
"entryFile": "src/public-api.ts",
"styleIncludePaths": [
"../core/styles"
]
},
"whitelistedNonPeerDependencies": [
"."
]
}
}
2 changes: 1 addition & 1 deletion projects/addon-doc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"repository": "https://github.com/tinkoff/taiga-ui",
"license": "Apache-2.0",
"dependencies": {
"@angular-devkit/schematics": "~10.2.4",
"@angular-devkit/schematics": "~11.2.19",
"highlight.js": "^11.5.1",
"markdown-it": "^12.3.2",
"ngx-highlightjs": "^4.1.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!-- TODO: 3.0 remove any after angular update -->
<button
*ngFor="let color of $any(colors) | keyvalue"
*ngFor="let color of colors | keyvalue"
type="button"
class="t-button"
[style.background]="color.value"
Expand Down
8 changes: 4 additions & 4 deletions projects/addon-editor/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"allowedNonPeerDependencies": [
"."
],
"dest": "../../dist/addon-editor",
"lib": {
"entryFile": "index.ts",
"styleIncludePaths": [
"../core/styles"
]
},
"whitelistedNonPeerDependencies": [
"."
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import {clamp} from '@taiga-ui/cdk';
import {tuiZonefulMap} from '@taiga-ui/core';
import {Observable} from 'rxjs';

import {TuiSheetComponent} from '../sheet/sheet.component';
import {TUI_SHEET_SCROLL} from '../sheet/sheet.providers';
import {TuiSheetRequiredProps} from '../../sheet';
import {TUI_SHEET, TUI_SHEET_SCROLL} from '../../sheet-tokens';

@Component({
selector: `tui-sheet-bar`,
Expand All @@ -18,7 +18,7 @@ export class TuiSheetBarComponent {
);

constructor(
@Inject(TuiSheetComponent) private readonly sheet: TuiSheetComponent<unknown>,
@Inject(TUI_SHEET) private readonly sheet: TuiSheetRequiredProps,
@Inject(TUI_SHEET_SCROLL) private readonly scroll$: Observable<number>,
@Inject(NgZone) private readonly ngZone: NgZone,
) {}
Expand Down
Loading

0 comments on commit a698286

Please sign in to comment.