Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump angular to 18.1 #1825

Merged
merged 3 commits into from
Aug 5, 2024
Merged

chore: bump angular to 18.1 #1825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cefe237
chore: bump angular to 18.1
cipchk Aug 5, 2024
d188d3a
style: fix
cipchk Aug 5, 2024
b1153c5
chore: update yarn.lock.txt
cipchk Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"editor.formatOnSave": false
},
"files.associations": {
"package.json": "json",
"*.json": "jsonc",
".prettierrc": "json"
},
Expand Down
102 changes: 51 additions & 51 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,54 +51,62 @@
"sync-scaffold-version": "node scripts/publish/sync-scaffold-version.js"
},
"dependencies": {
"@angular/animations": "^18.0.0",
"@angular/cdk": "^18.0.5",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/elements": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/platform-server": "^18.0.0",
"@angular/router": "^18.0.0",
"@angular/service-worker": "^18.0.0",
"@angular/ssr": "^18.0.0",
"@angular/animations": "^18.1.0",
"@angular/common": "^18.1.0",
"@angular/compiler": "^18.1.0",
"@angular/core": "^18.1.0",
"@angular/forms": "^18.1.0",
"@angular/platform-browser": "^18.1.0",
"@angular/platform-browser-dynamic": "^18.1.0",
"@angular/router": "^18.1.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.3",
"@angular/cdk": "^18.1.0",
"@angular/elements": "^18.1.0",
"@angular/platform-server": "^18.1.0",
"@angular/service-worker": "^18.1.0",
"@angular/ssr": "^18.1.0",
"@antv/data-set": "^0.11.8",
"@antv/g2": "^4.2.10",
"@github/hotkey": "^3.1.1",
"@ng-util/monaco-editor": "^18.0.0",
"@stackblitz/sdk": "^1.10.0",
"@stackblitz/sdk": "^1.11.0",
"@webcomponents/custom-elements": "^1.6.0",
"ajv": "^8.16.0",
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
"aos": "^3.0.0-beta.6",
"codesandbox": "^2.2.3",
"echarts": "^5.5.0",
"echarts": "^5.5.1",
"express": "^4.19.2",
"extend": "^3.0.2",
"file-saver": "^2.0.5",
"isutf8": "^4.0.0",
"ng-github-button": "^18.0.0",
"ng-zorro-antd": "^18.0.1",
"ng-zorro-antd": "^18.1.0",
"ngx-countdown": "^18.0.0",
"ngx-highlight-js": "^18.0.0",
"ngx-tinymce": "^18.0.0",
"qrious": "^4.0.2",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.3"
"qrious": "^4.0.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.0.4",
"@angular-eslint/builder": "^18.0.1",
"@angular-eslint/eslint-plugin": "^18.0.0",
"@angular-eslint/eslint-plugin-template": "^18.0.0",
"@angular-eslint/schematics": "^18.0.0",
"@angular-eslint/template-parser": "^18.0.0",
"@angular/cli": "^18.0.4",
"@angular/compiler-cli": "^18.0.0",
"@angular/language-service": "^18.0.0",
"@angular-devkit/build-angular": "^18.1.3",
"@angular/cli": "^18.1.3",
"@angular/compiler-cli": "^18.1.0",
"@types/jasmine": "~5.1.0",
"jasmine-core": "~5.1.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.5.2",
"@angular-eslint/builder": "^18.2.0",
"@angular-eslint/eslint-plugin": "^18.2.0",
"@angular-eslint/eslint-plugin-template": "^18.2.0",
"@angular-eslint/schematics": "^18.2.0",
"@angular-eslint/template-parser": "^18.2.0",
"@angular/language-service": "^18.1.0",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-angular": "^19.3.0",
"@types/aos": "^3.0.7",
Expand All @@ -107,13 +115,12 @@
"@types/extend": "^3.0.4",
"@types/file-saver": "^2.0.7",
"@types/fs-extra": "^11.0.4",
"@types/jasmine": "~5.1.0",
"@types/jasminewd2": "~2.0.13",
"@types/mockjs": "^1.0.10",
"@types/node": "^18.19.39",
"@types/parse5": "^7.0.0",
"@typescript-eslint/eslint-plugin": "^7.11.0",
"@typescript-eslint/parser": "^7.11.0",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"chalk": "^5.3.0",
"codecov": "^3.8.3",
"conventional-changelog-cli": "^5.0.0",
Expand All @@ -127,51 +134,44 @@
"eslint-plugin-prettier": "~5.0.0",
"fs-extra": "^11.2.0",
"html-minifier-terser": "^7.2.0",
"husky": "^9.0.11",
"jasmine": "^5.1.0",
"jasmine-core": "~5.1.0",
"husky": "^9.1.4",
"jasmine": "^5.2.0",
"jasmine-spec-reporter": "^7.0.0",
"jsonml.js": "^0.1.0",
"jszip": "^3.10.1",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"karma-junit-reporter": "^2.0.1",
"karma-parallel": "^0.3.1",
"karma-spec-reporter": "0.0.36",
"karma-summary-reporter": "^4.0.1",
"karma-viewport": "^1.0.9",
"klaw-sync": "^6.0.0",
"less-bundle-promise": "^1.0.11",
"less-plugin-clean-css": "^1.5.1",
"less-plugin-clean-css": "^1.6.0",
"less-plugin-npm-import": "^2.1.0",
"less-vars-to-js": "^1.3.0",
"lint-staged": "^15.2.7",
"lint-staged": "^15.2.8",
"mark-twain": "^2.0.3",
"mockjs": "^1.1.0",
"mustache": "^4.2.0",
"ng-alain-plugin-theme": "^18.0.0",
"ng-alain-sts": "^0.0.2",
"ng-packagr": "^18.0.0",
"ng-packagr": "^18.1.0",
"parse5": "^7.1.2",
"plyr": "^3.7.8",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"readline-sync": "^1.4.10",
"screenfull": "^6.0.2",
"sitemap": "^8.0.0",
"source-map-explorer": "^2.5.3",
"stream": "0.0.2",
"stylelint": "^16.6.1",
"stylelint-config-clean-order": "^6.0.0",
"stylelint-config-standard": "^36.0.0",
"stream": "0.0.3",
"stylelint": "^16.8.1",
"stylelint-config-clean-order": "^6.1.0",
"stylelint-config-standard": "^36.0.1",
"stylelint-declaration-block-no-ignored-properties": "^2.8.0",
"swagger-typescript-api": "^12.0.4",
"terser": "^5.31.1",
"terser": "^5.31.3",
"ts-node": "~10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "~5.4.2",
"xlsx": "^0.18.5"
},
"lint-staged": {
Expand Down
4 changes: 2 additions & 2 deletions packages/abc/st/st.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
import type { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
import { DecimalPipe, DOCUMENT } from '@angular/common';
import {
AfterViewInit,
Expand Down Expand Up @@ -805,7 +805,7 @@ export class STComponent implements AfterViewInit, OnChanges {
// #endregion

get cdkVirtualScrollViewport(): CdkVirtualScrollViewport | undefined {
return this.orgTable?.cdkVirtualScrollViewport;
return this.orgTable?.cdkVirtualScrollViewport as NzSafeAny;
}

private _resetColumns(options?: STResetColumnsOption): Observable<this> {
Expand Down
2 changes: 1 addition & 1 deletion packages/form/src/widgets/number/number.widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class NumberWidget extends ControlUIWidget<SFNumberWidgetSchema> implemen
}
if (ui.formatter) this.formatter = ui.formatter;
if (ui.parser) this.parser = ui.parser;
this.width = typeof ui.widgetWidth === 'number' ? `${ui.widgetWidth}px` : ui.widgetWidth ?? '90px';
this.width = typeof ui.widgetWidth === 'number' ? `${ui.widgetWidth}px` : (ui.widgetWidth ?? '90px');
}

_setValue(val: number): void {
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/layout-default/layout.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export class LayoutDefaultComponent {
}
if (ev instanceof NavigationError || ev instanceof NavigationCancel) {
this.isFetching = false;
const err = this.customError === null ? null : this.customError ?? `Could not load ${ev.url} route`;
const err = this.customError === null ? null : (this.customError ?? `Could not load ${ev.url} route`);
if (err && ev instanceof NavigationError) {
this.msgSrv.error(err, { nzDuration: 1000 * 3 });
}
Expand Down
Loading
Loading