Skip to content

Commit

Permalink
chore: bump to angular v17.1 (#8369)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicoss54 authored Feb 5, 2024
1 parent 3dc1579 commit b582eb7
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 58 deletions.
3 changes: 1 addition & 2 deletions components/code-editor/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"lib": {
"entryFile": "public-api.ts"
},
"allowedNonPeerDependencies": ["monaco-editor"]
}
}
3 changes: 1 addition & 2 deletions components/color-picker/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"lib": {
"entryFile": "public-api.ts"
},
"allowedNonPeerDependencies": ["ng-antd-color-picker"]
}
}
3 changes: 1 addition & 2 deletions components/cron-expression/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"lib": {
"entryFile": "public-api.ts"
},
"allowedNonPeerDependencies": ["cron-parser"]
}
}
3 changes: 1 addition & 2 deletions components/date-picker/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"lib": {
"entryFile": "public-api.ts"
},
"allowedNonPeerDependencies": ["tslib", "date-fns"]
}
}
3 changes: 1 addition & 2 deletions components/graph/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"lib": {
"entryFile": "public-api.ts"
},
"allowedNonPeerDependencies": ["dagre-compound", "d3"]
}
}
3 changes: 1 addition & 2 deletions components/icon/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"lib": {
"entryFile": "public-api.ts"
},
"allowedNonPeerDependencies": ["tslib", "@ant-design/icons-angular"]
}
}
12 changes: 11 additions & 1 deletion components/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,15 @@
"lib": {
"entryFile": "./public_api.ts"
},
"allowedNonPeerDependencies": ["tslib", "angular", "date-fns", "@ant-design/icons-angular"]
"allowedNonPeerDependencies": [
"tslib",
"angular",
"date-fns",
"@ant-design/icons-angular",
"monaco-editor",
"ng-antd-color-picker",
"cron-parser",
"dagre-compound",
"d3"
]
}
7 changes: 3 additions & 4 deletions components/tree-view/padding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
*/

import { NumberInput } from '@angular/cdk/coercion';
import { CdkTreeNodePadding } from '@angular/cdk/tree';
import { Directive, Input } from '@angular/core';
import { Directive, Input, numberAttribute } from '@angular/core';

@Directive({
selector: '[nzTreeNodePadding]',
Expand All @@ -15,11 +14,11 @@ import { Directive, Input } from '@angular/core';
export class NzTreeNodePaddingDirective<T> extends CdkTreeNodePadding<T> {
override _indent = 24;

@Input('nzTreeNodePadding')
@Input({ alias: 'nzTreeNodePadding', transform: numberAttribute })
override get level(): number {
return this._level;
}
override set level(value: NumberInput) {
override set level(value: number) {
this._setLevelInput(value);
}

Expand Down
15 changes: 2 additions & 13 deletions components/tree-view/toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
* found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
*/

import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { CdkTreeNodeToggle } from '@angular/cdk/tree';
import { Directive, Input } from '@angular/core';

import { BooleanInput } from 'ng-zorro-antd/core/types';
import { booleanAttribute, Directive, Input } from '@angular/core';

@Directive({
selector: 'nz-tree-node-toggle[nzTreeNodeNoopToggle], [nzTreeNodeNoopToggle]',
Expand All @@ -29,15 +26,7 @@ export class NzTreeNodeNoopToggleDirective {}
standalone: true
})
export class NzTreeNodeToggleDirective<T> extends CdkTreeNodeToggle<T> {
static ngAcceptInputType_recursive: BooleanInput;

@Input('nzTreeNodeToggleRecursive')
override get recursive(): boolean {
return this._recursive;
}
override set recursive(value: boolean) {
this._recursive = coerceBooleanProperty(value);
}
@Input({ alias: 'nzTreeNodeToggleRecursive', transform: booleanAttribute }) override recursive = false;

get isExpanded(): boolean {
return this._treeNode.isExpanded;
Expand Down
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,40 @@
"prepare": "husky install"
},
"dependencies": {
"@angular/cdk": "~17.0.0",
"@angular/cdk": "~17.1.0",
"@ant-design/icons-angular": "^17.0.0",
"date-fns": "^2.16.1",
"ngx-quicklink": "^0.4.2"
},
"devDependencies": {
"@angular-builders/custom-webpack": "17.0.0",
"@angular-devkit/build-angular": "~17.0.0",
"@angular-devkit/core": "~17.0.0",
"@angular-devkit/schematics": "~17.0.0",
"@angular-eslint/builder": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/schematics": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/animations": "~17.0.1",
"@angular/cli": "~17.0.0",
"@angular/common": "~17.0.1",
"@angular/compiler": "~17.0.1",
"@angular/compiler-cli": "~17.0.1",
"@angular/core": "~17.0.1",
"@angular/forms": "~17.0.1",
"@angular/language-service": "~17.0.1",
"@angular/platform-browser": "~17.0.1",
"@angular/platform-browser-dynamic": "~17.0.1",
"@angular/platform-server": "~17.0.1",
"@angular/router": "~17.0.1",
"@angular/service-worker": "~17.0.1",
"@angular/ssr": "~17.0.0",
"@angular-builders/custom-webpack": "17.0.1-beta.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-devkit/core": "~17.1.0",
"@angular-devkit/schematics": "~17.1.0",
"@angular-eslint/builder": "~17.2.1",
"@angular-eslint/eslint-plugin": "~17.2.1",
"@angular-eslint/eslint-plugin-template": "~17.2.1",
"@angular-eslint/schematics": "~17.2.1",
"@angular-eslint/template-parser": "~17.2.1",
"@angular/animations": "~17.1.0",
"@angular/cli": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/platform-server": "~17.1.0",
"@angular/router": "~17.1.0",
"@angular/service-worker": "~17.1.0",
"@angular/ssr": "~17.1.0",
"@ant-design/dark-theme": "^2.0.2",
"@commitlint/cli": "^13.0.0",
"@commitlint/config-angular": "^13.0.0",
"@ctrl/tinycolor": "^3.6.0",
"@schematics/angular": "~17.0.0",
"@schematics/angular": "~17.1.0",
"@stackblitz/sdk": "^1.5.2",
"@types/d3": "^6.2.0",
"@types/fs-extra": "^9.0.5",
Expand Down Expand Up @@ -118,7 +118,7 @@
"minimist": "^1.2.5",
"monaco-editor": "^0.33.0",
"ng-antd-color-picker": "^1.1.0",
"ng-packagr": "~17.0.0",
"ng-packagr": "~17.1.1",
"ngx-color": "^8.0.3",
"node-prismjs": "^0.1.2",
"parse5": "^6.0.1",
Expand All @@ -137,7 +137,7 @@
"terser": "^5.5.1",
"ts-node": "^10.9.1",
"tslib": "^2.0.3",
"typescript": "~5.2.2",
"typescript": "~5.3.3",
"yaml-front-matter": "^4.1.1",
"zone.js": "~0.14.2"
},
Expand All @@ -146,4 +146,4 @@
"eslint --fix"
]
}
}
}

0 comments on commit b582eb7

Please sign in to comment.