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.

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

build: update angualr 17 #1687

Merged
merged 11 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: build
run: |
yarn run site:build:ssr
yarn run site:build
cp ./src/dist/browser/index.html ./src/dist/browser/404.html
cp ./Dockerfile.docs ./src/dist/browser/Dockerfile.docs
cp -r ./_nginx/ ./src/dist/browser/_nginx
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.0
18.13.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Delon

<div align="center">

Delon is a set of essential modules for [ng-alain](https://ng-alain.com).
Delon is a set of essential modules for [NG-ALAIN](https://ng-alain.com).

[![Build Status](https://dev.azure.com/ng-alain/delon/_apis/build/status/delon-CI?branchName=master)](https://dev.azure.com/ng-alain/delon/_build/latest?definitionId=1&branchName=master)
[![Codecov](https://img.shields.io/codecov/c/github/ng-alain/delon.svg?style=flat-square)](https://codecov.io/gh/ng-alain/delon)
Expand Down
29 changes: 16 additions & 13 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "src/dist/browser",
"outputPath": "src/dist",
"index": "src/index.html",
"main": "src/main.ts",
"browser": "src/main.ts",
"tsConfig": "src/tsconfig.json",
"polyfills": "src/polyfills.ts",
"polyfills": [
"@webcomponents/custom-elements",
"@webcomponents/custom-elements/src/native-shim",
"zone.js"
],
"assets": [
"src/assets",
"src/manifest.json",
Expand Down Expand Up @@ -89,16 +93,12 @@
}
],
"outputHashing": "all",
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json"
"serviceWorker": "ngsw-config.json"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
"sourceMap": true
}
},
"defaultConfiguration": "production"
Expand All @@ -107,10 +107,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "site:build:production"
"buildTarget": "site:build:production"
},
"development": {
"browserTarget": "site:build:development"
"buildTarget": "site:build:development"
}
},
"defaultConfiguration": "development"
Expand Down Expand Up @@ -140,7 +140,10 @@
"builder": "@nguniversal/builders:ssr-dev-server",
"options": {
"browserTarget": "site:build",
"serverTarget": "site:server"
"serverTarget": "site:server",
"polyfills": [
"zone.js"
]
},
"configurations": {
"production": {
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ stages:
ACCESS_REPO: $(ACCESS_REPO)
ACCESS_TOKEN: $(ACCESS_TOKEN)
- script: |
yarn run site:build:ssr
yarn run site:build
displayName: 'Build site'
- script: |
export DEPLOY_DOMAIN=https://preview-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ng-alain-delon.surge.sh
Expand Down
111 changes: 54 additions & 57 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"homepage": "https://ng-alain.com",
"engines": {
"node": "^18.10.0"
"node": "^18.13.0"
},
"scripts": {
"ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
Expand Down Expand Up @@ -55,20 +55,20 @@
"ssr:prerender": "npm run ng-high-memory run site:prerender"
},
"dependencies": {
"@angular/animations": "^16.2.0",
"@angular/common": "^16.2.0",
"@angular/compiler": "^16.2.0",
"@angular/core": "^16.2.0",
"@angular/forms": "^16.2.0",
"@angular/platform-browser": "^16.2.0",
"@angular/platform-browser-dynamic": "^16.2.0",
"@angular/router": "^16.2.0",
"@angular/animations": "^17.0.0",
"@angular/common": "^17.0.0",
"@angular/compiler": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/platform-browser": "^17.0.0",
"@angular/platform-browser-dynamic": "^17.0.0",
"@angular/router": "^17.0.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.13.0",
"@angular/service-worker": "^16.2.0",
"@angular/platform-server": "^16.2.0",
"@angular/elements": "^16.2.0",
"zone.js": "~0.14.2",
"@angular/service-worker": "^17.0.0",
"@angular/platform-server": "^17.0.0",
"@angular/elements": "^17.0.0",
"@antv/data-set": "^0.11.8",
"@antv/g2": "^4.2.10",
"echarts": "^5.4.3",
Expand All @@ -78,56 +78,55 @@
"ajv-formats": "^2.1.1",
"extend": "^3.0.2",
"file-saver": "^2.0.5",
"ng-github-button": "^16.0.0",
"ng-zorro-antd": "^16.2.2",
"ng-github-button": "^17.0.0",
"ng-zorro-antd": "^17.0.0-beta.0",
"ngx-color": "~9.0.0",
"ngx-countdown": "^16.0.0",
"ngx-highlight-js": "^16.1.0",
"ngx-tinymce": "^16.0.0",
"ngx-countdown": "^17.0.0",
"ngx-highlight-js": "^17.0.0",
"ngx-tinymce": "^17.0.0",
"qrious": "^4.0.2",
"@webcomponents/custom-elements": "^1.6.0",
"aos": "^3.0.0-beta.6",
"@ng-util/monaco-editor": "^16.0.1",
"@ng-util/monaco-editor": "^17.0.0",
"@nguniversal/express-engine": "^16.2.0",
"express": "^4.18.2",
"isutf8": "^4.0.0",
"@github/hotkey": "^2.0.1",
"@github/hotkey": "^2.3.0",
"ng-antd-color-picker": "^0.0.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.2.0",
"@angular/cli": "~16.2.0",
"@angular/compiler-cli": "^16.2.0",
"@types/jasmine": "~4.3.0",
"jasmine-core": "~4.6.0",
"@angular-devkit/build-angular": "^17.0.0",
"@angular/cli": "^17.0.0",
"@angular/compiler-cli": "^17.0.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.1.3",
"codelyzer": "^6.0.2",
"typescript": "~5.2.2",
"jasmine": "^5.1.0",
"jasmine-spec-reporter": "^7.0.0",
"protractor": "~7.0.0",
"ts-node": "~10.9.1",
"@angular/language-service": "^16.2.0",
"@types/jasminewd2": "~2.0.10",
"@angular/language-service": "^17.0.0",
"@types/jasminewd2": "~2.0.13",
"karma-junit-reporter": "^2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-viewport": "^1.0.9",
"@types/aos": "^3.0.4",
"@types/file-saver": "^2.0.5",
"@types/deep-extend": "^0.6.0",
"@types/extend": "^3.0.1",
"@types/mockjs": "^1.0.7",
"@types/aos": "^3.0.7",
"@types/file-saver": "^2.0.7",
"@types/deep-extend": "^0.6.2",
"@types/extend": "^3.0.4",
"@types/mockjs": "^1.0.10",
"@types/parse5": "^7.0.0",
"karma-summary-reporter": "^3.1.1",
"karma-parallel": "^0.3.1",
"chalk": "^5.3.0",
"codecov": "^3.8.3",
"conventional-changelog-cli": "^4.0.0",
"conventional-changelog-cli": "^4.1.0",
"fs-extra": "^11.1.1",
"@types/fs-extra": "^11.0.1",
"@types/fs-extra": "^11.0.4",
"husky": "^8.0.3",
"jsonml.js": "^0.1.0",
"klaw-sync": "^6.0.0",
Expand All @@ -137,12 +136,12 @@
"mark-twain": "^2.0.3",
"mockjs": "^1.1.0",
"mustache": "^4.2.0",
"ng-packagr": "^16.2.1",
"ng-packagr": "^17.0.0",
"parse5": "^7.1.2",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"readline-sync": "^1.4.10",
"stream": "0.0.2",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-declaration-block-no-ignored-properties": "^2.7.0",
"stylelint-config-clean-order": "^5.2.0",
Expand All @@ -152,32 +151,30 @@
"plyr": "^3.7.8",
"screenfull": "^6.0.2",
"less-bundle-promise": "^1.0.11",
"ng-alain-codelyzer": "^0.0.1",
"ng-alain-sts": "^0.0.2",
"ng-alain-plugin-theme": "^16.0.0",
"tsconfig-paths": "^4.2.0",
"@nguniversal/builders": "^16.2.0",
"@types/express": "^4.17.17",
"@types/express": "^4.17.21",
"html-minifier-terser": "^7.2.0",
"terser": "^5.19.2",
"@commitlint/cli": "^17.7.1",
"@commitlint/config-angular": "^17.7.0",
"@angular-eslint/builder": "~16.1.1",
"@angular-eslint/eslint-plugin": "~16.1.1",
"@angular-eslint/eslint-plugin-template": "~16.1.1",
"@angular-eslint/schematics": "~16.1.1",
"@angular-eslint/template-parser": "~16.1.1",
"@typescript-eslint/eslint-plugin": "~6.4.1",
"@typescript-eslint/parser": "~6.4.1",
"eslint": "^8.48.0",
"@commitlint/cli": "^17.8.1",
"@commitlint/config-angular": "^17.8.1",
"@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",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "~9.0.0",
"eslint-plugin-import": "~2.28.1",
"eslint-plugin-jsdoc": "~46.5.0",
"eslint-plugin-import": "~2.29.0",
"eslint-plugin-jsdoc": "~46.5.1",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-prettier": "~5.0.0",
"eslint-plugin-deprecation": "~1.5.0",
"eslint-plugin-prettier": "~5.0.1",
"eslint-plugin-deprecation": "~2.0.0",
"lint-staged": "^14.0.1",
"raw-loader": "^4.0.2",
"swagger-typescript-api": "^12.0.4",
"sitemap": "^7.1.1"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/abc/ellipsis/ellipsis.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
<ng-container [ngSwitch]="type">
<span *ngSwitchCase="'default'" [ngClass]="cls"></span>
<ng-container *ngSwitchCase="'length'">
<ng-template [ngTemplateOutlet]="tooltipTpl" [ngTemplateOutletContext]="{ $implicit: lengthTpl }"></ng-template>
<ng-template [ngTemplateOutlet]="tooltipTpl" [ngTemplateOutletContext]="{ $implicit: lengthTpl }" />
<ng-template #lengthTpl>{{ text }}</ng-template>
</ng-container>
<ng-container *ngSwitchCase="'line-clamp'">
<ng-template [ngTemplateOutlet]="tooltipTpl" [ngTemplateOutletContext]="{ $implicit: lineClampTpl }"></ng-template>
<ng-template [ngTemplateOutlet]="tooltipTpl" [ngTemplateOutletContext]="{ $implicit: lineClampTpl }" />
<ng-template #lineClampTpl>
<div [ngClass]="cls" [ngStyle]="{ '-webkit-line-clamp': lines, '-webkit-box-orient': 'vertical' }"></div>
</ng-template>
</ng-container>
<div *ngSwitchCase="'line'" [ngClass]="cls">
<div class="ellipsis__handle">
<ng-template [ngTemplateOutlet]="tooltipTpl" [ngTemplateOutletContext]="{ $implicit: lineTpl }"></ng-template>
<ng-template [ngTemplateOutlet]="tooltipTpl" [ngTemplateOutletContext]="{ $implicit: lineTpl }" />
<ng-template #lineTpl>{{ linsWord }}</ng-template>
<div class="ellipsis__shadow" #shadowOrgEl [innerHTML]="orgHtml"></div>
<div class="ellipsis__shadow" #shadowTextEl>
Expand Down
6 changes: 3 additions & 3 deletions packages/abc/st/st-td.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<ng-template #btnTpl let-i let-child="child">
<ng-container *ngIf="!i.tooltip">
<ng-template [ngTemplateOutlet]="btnItemTpl" [ngTemplateOutletContext]="{ $implicit: i }"></ng-template>
<ng-template [ngTemplateOutlet]="btnItemTpl" [ngTemplateOutletContext]="{ $implicit: i }" />
</ng-container>
<span *ngIf="i.tooltip" nz-tooltip [nzTooltipTitle]="i.tooltip" [class.d-block]="child" [class.width-100]="child">
<ng-template [ngTemplateOutlet]="btnItemTpl" [ngTemplateOutletContext]="{ $implicit: i }"></ng-template>
<ng-template [ngTemplateOutlet]="btnItemTpl" [ngTemplateOutletContext]="{ $implicit: i }" />
</span>
</ng-template>
<ng-template #btnItemTpl let-i>
Expand Down Expand Up @@ -80,7 +80,7 @@
/>
</ng-container>
<cell *ngSwitchCase="'cell'" [value]="i._values[cIdx].text" [options]="i._values[cIdx].cell ?? c.cell" />
<ng-template *ngSwitchCase="'widget'" st-widget-host [record]="i" [column]="c"></ng-template>
<ng-template *ngSwitchCase="'widget'" st-widget-host [record]="i" [column]="c" />
<ng-container *ngSwitchDefault>
<span
*ngIf="c.safeType !== 'text'"
Expand Down
2 changes: 1 addition & 1 deletion packages/chart/custom/custom.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { InputNumber, NumberInput } from '@delon/util/decorator';
exportAs: 'g2Custom',
template: `
<nz-skeleton *ngIf="!loaded" />
<ng-content></ng-content>
<ng-content />
`,
host: {
'[style.height.px]': 'height'
Expand Down
2 changes: 1 addition & 1 deletion packages/form/src/widgets/custom/custom.widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { ControlUIWidget } from '../../widget';
<ng-template
[ngTemplateOutlet]="$any(ui)._render"
[ngTemplateOutletContext]="{ $implicit: this, schema: schema, ui: ui }"
></ng-template>
/>
</sf-item-wrap>
`,
preserveWhitespaces: false,
Expand Down
2 changes: 1 addition & 1 deletion packages/util/pipes/currency/demo/currency-cny.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Component } from '@angular/core';
selector: 'app-demo',
template: `
<p class="mb-md">
{{<span> {{ value }} | cny </span>}} = {{ value | cny }}
&#123;&#123;<span> {{ value }} | cny </span>&#125;&#125; = {{ value | cny }}
</p>
<nz-input-group nzAddOnBefore="Value">
<input type="text" nz-input [(ngModel)]="value" />
Expand Down
6 changes: 3 additions & 3 deletions packages/util/pipes/currency/demo/currency-mega.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import { Component } from '@angular/core';
selector: 'app-demo',
template: `
<p class="mb-md">
{{<span> {{ value }} | mega </span>}} = {{ value | mega }}
&#123;&#123;<span> {{ value }} | mega </span>&#125;&#125; = {{ value | mega }}
</p>
<p class="mb-md">
{{<span>
&#123;&#123;<span>
{{ value }} | mega: 大括号 precision: <span>{{ precision }}</span> 大括号 </span
>}} =
>&#125;&#125; =
{{ value | mega: { precision: precision } }}
</p>
<nz-input-group nzAddOnBefore="Value" class="mb-md">
Expand Down
2 changes: 1 addition & 1 deletion packages/util/pipes/currency/demo/currency-price.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Component } from '@angular/core';
selector: 'app-demo',
template: `
<p class="mb-md">
{{<span> {{ value }} | price </span>}} = {{ value | price: { precision: precision } }}
&#123;&#123;<span> {{ value }} | price </span>&#125;&#125; = {{ value | price: { precision: precision } }}
</p>
<nz-input-group nzAddOnBefore="Value" class="mb-md">
<input type="text" nz-input [(ngModel)]="value" />
Expand Down
2 changes: 1 addition & 1 deletion packages/util/pipes/filter/demo/filter.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Component } from '@angular/core';
selector: 'app-demo',
template: `
<p class="mb-md">
{{<span> {{ list | json }} | filter: matcher </span>}} = {{ list | filter: matcher:number | json }}
&#123;&#123;<span> {{ list | json }} | filter: matcher </span>&#125;&#125; = {{ list | filter: matcher:number | json }}
</p>
<p class="mb-md">matcher = (item: PriceObject, number: number) => item.price > number;</p>
<nz-input-group nzAddOnBefore="number">
Expand Down
2 changes: 1 addition & 1 deletion packages/util/pipes/format/demo/format-mask.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Component } from '@angular/core';
selector: 'app-demo',
template: `
<p class="mb-md">
{{<span> {{ value }} | mask: {{ maskStr | json }} </span>}} = {{ value | mask: maskStr }}
&#123;&#123;<span> {{ value }} | mask: {{ maskStr | json }} </span>&#125;&#125; = {{ value | mask: maskStr }}
</p>
<nz-input-group nzAddOnBefore="Value" class="mb-md">
<input type="text" nz-input [(ngModel)]="value" />
Expand Down
Loading