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

chore: bump angular to 19 #1855

Merged
merged 3 commits into from
Jan 3, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/build-doc-site-aliyun-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login Docker
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: registry.cn-hangzhou.aliyuncs.com
username: ${{ secrets.ALIYUN_USERNAME }}
password: ${{ secrets.ALIYUN_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile.docs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-doc-site-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login Docker
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
# registry: registry.gitlab.com
# username: ${{ secrets.GITLAB_USERNAME }}
Expand All @@ -28,7 +28,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile.docs
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
ACCESS_REPO: ${{ github.repository }}
ACCESS_TOKEN: ${{ secrets.CI_TOKEN }}
PR_NUMBER: ${{ github.event.number }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ./node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock', '**/*.patch') }}
Expand Down Expand Up @@ -72,15 +72,15 @@ jobs:
with:
node-version-file: '.nvmrc'
cache: 'yarn'
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ./node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock', '**/*.patch') }}
- name: Install node modules
run: yarn install --frozen-lockfile
- name: Test
run: yarn run test
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./coverage/
Expand All @@ -96,7 +96,7 @@ jobs:
with:
node-version-file: '.nvmrc'
cache: 'yarn'
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ./node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock', '**/*.patch') }}
Expand All @@ -113,7 +113,7 @@ jobs:
with:
node-version-file: '.nvmrc'
cache: 'yarn'
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ./node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock', '**/*.patch') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
cp -r ./_nginx/ ./src/dist/browser/_nginx

- name: deploy-to-gh-pages
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
# env:
# # PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
# # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.5.0.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.6.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ enableImmutableInstalls: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.0.cjs
yarnPath: .yarn/releases/yarn-4.6.0.cjs
97 changes: 48 additions & 49 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,56 +51,56 @@
"sync-scaffold-version": "node scripts/publish/sync-scaffold-version.js"
},
"dependencies": {
"@angular/animations": "^18.2.0",
"@angular/cdk": "^18.2.0",
"@angular/common": "^18.2.0",
"@angular/compiler": "^18.2.0",
"@angular/core": "^18.2.0",
"@angular/elements": "^18.2.0",
"@angular/forms": "^18.2.0",
"@angular/platform-browser": "^18.2.0",
"@angular/platform-browser-dynamic": "^18.2.0",
"@angular/platform-server": "^18.2.0",
"@angular/router": "^18.2.0",
"@angular/service-worker": "^18.2.0",
"@angular/ssr": "^18.2.0",
"@angular/animations": "^19.0.5",
"@angular/cdk": "^19.0.4",
"@angular/common": "^19.0.5",
"@angular/compiler": "^19.0.5",
"@angular/core": "^19.0.5",
"@angular/elements": "^19.0.5",
"@angular/forms": "^19.0.5",
"@angular/platform-browser": "^19.0.5",
"@angular/platform-browser-dynamic": "^19.0.5",
"@angular/platform-server": "^19.0.5",
"@angular/router": "^19.0.5",
"@angular/service-worker": "^19.0.5",
"@angular/ssr": "^19.0.6",
"@antv/data-set": "^0.11.8",
"@antv/g2": "^4.2.10",
"@github/hotkey": "^3.1.1",
"@ng-util/monaco-editor": "^18.0.0",
"@ng-util/monaco-editor": "^19.0.0",
"@stackblitz/sdk": "^1.11.0",
"@webcomponents/custom-elements": "^1.6.0",
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
"aos": "^3.0.0-beta.6",
"codesandbox": "^2.2.3",
"echarts": "^5.5.1",
"echarts": "^5.6.0",
"express": "^4.21.0",
"extend": "^3.0.2",
"file-saver": "^2.0.5",
"isutf8": "^4.0.1",
"ng-github-button": "^18.0.0",
"ng-zorro-antd": "^18.2.0",
"ngx-countdown": "^18.0.0",
"ngx-highlight-js": "^18.0.0",
"ngx-tinymce": "^18.0.0",
"ng-github-button": "^19.0.0",
"ng-zorro-antd": "^19.0.1",
"ngx-countdown": "^19.0.0",
"ngx-highlight-js": "^19.0.0",
"ngx-tinymce": "^19.0.0",
"qrious": "^4.0.2",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.10"
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.2.7",
"@angular-eslint/builder": "^18.3.1",
"@angular-eslint/eslint-plugin": "^18.3.1",
"@angular-eslint/eslint-plugin-template": "^18.3.1",
"@angular-eslint/schematics": "^18.3.1",
"@angular-eslint/template-parser": "^18.3.1",
"@angular/cli": "^18.2.7",
"@angular/compiler-cli": "^18.2.0",
"@angular/language-service": "^18.2.0",
"@commitlint/cli": "^19.5.0",
"@commitlint/config-angular": "^19.5.0",
"@angular-devkit/build-angular": "^19.0.6",
"@angular-eslint/builder": "^19.0.2",
"@angular-eslint/eslint-plugin": "^19.0.2",
"@angular-eslint/eslint-plugin-template": "^19.0.2",
"@angular-eslint/schematics": "^19.0.2",
"@angular-eslint/template-parser": "^19.0.2",
"@angular/cli": "^19.0.6",
"@angular/compiler-cli": "^19.0.0",
"@angular/language-service": "^19.0.5",
"@commitlint/cli": "^19.6.1",
"@commitlint/config-angular": "^19.6.0",
"@types/aos": "^3.0.7",
"@types/deep-extend": "^0.6.2",
"@types/express": "^5.0.0",
Expand All @@ -112,24 +112,23 @@
"@types/mockjs": "^1.0.10",
"@types/node": "^18.19.1",
"@types/parse5": "^7.0.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"chalk": "^5.3.0",
"codecov": "^3.8.3",
"@typescript-eslint/eslint-plugin": "^8.19.0",
"@typescript-eslint/parser": "^8.19.0",
"chalk": "^5.4.1",
"conventional-changelog-cli": "^5.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "~9.1.0",
"eslint-plugin-deprecation": "^3.0.0",
"eslint-plugin-header": "~3.1.1",
"eslint-plugin-import": "~2.25.3",
"eslint-plugin-jsdoc": "~50.3.1",
"eslint-plugin-import": "~2.31.0",
"eslint-plugin-jsdoc": "~50.6.1",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-prettier": "~5.2.1",
"fs-extra": "^11.2.0",
"html-minifier-terser": "^7.2.0",
"husky": "^9.1.5",
"jasmine": "^5.2.0",
"jasmine-core": "~5.2.0",
"husky": "^9.1.7",
"jasmine": "^5.5.0",
"jasmine-core": "~5.4.0",
"jasmine-spec-reporter": "^7.0.0",
"jsonml.js": "^0.1.0",
"jszip": "^3.10.1",
Expand All @@ -148,30 +147,30 @@
"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.9",
"lint-staged": "^15.3.0",
"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.2.1",
"parse5": "^7.1.2",
"ng-packagr": "^19.0.1",
"parse5": "^7.2.1",
"plyr": "^3.7.8",
"prettier": "^3.3.3",
"prettier": "^3.4.2",
"readline-sync": "^1.4.10",
"screenfull": "^6.0.2",
"sitemap": "^8.0.0",
"source-map-explorer": "^2.5.3",
"stream": "0.0.3",
"stylelint": "^16.8.2",
"stylelint": "^16.12.0",
"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.34.1",
"terser": "^5.37.0",
"ts-node": "~10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "~5.5.2",
"typescript": "~5.6.2",
"xlsx": "^0.18.5"
},
"lint-staged": {
Expand All @@ -182,5 +181,5 @@
"npm run lint:style"
]
},
"packageManager": "yarn@4.5.0"
"packageManager": "yarn@4.6.0"
}
9 changes: 2 additions & 7 deletions packages/abc/auto-focus/auto-focus.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@ import { Component, ViewChild } from '@angular/core';
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';

import { AutoFocusDirective } from './auto-focus.directive';
import { AutoFocusModule } from './auto-focus.module';

describe('abc: auto-focus', () => {
let fixture: ComponentFixture<TestComponent>;
let context: TestComponent;

beforeEach(() => {
TestBed.configureTestingModule({
imports: [AutoFocusModule],
declarations: [TestComponent]
});

fixture = TestBed.createComponent(TestComponent);
context = fixture.componentInstance;
spyOn(context, 'focus');
Expand Down Expand Up @@ -47,7 +41,8 @@ describe('abc: auto-focus', () => {
<input auto-focus (focus)="focus()" delay="1" [enabled]="enabled" />
</div>
}
`
`,
imports: [AutoFocusDirective]
})
class TestComponent {
@ViewChild(AutoFocusDirective) comp!: AutoFocusDirective;
Expand Down
1 change: 0 additions & 1 deletion packages/abc/avatar-list/avatar-list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import { AvatarListItemComponent } from './avatar-list-item.component';
preserveWhitespaces: false,
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
standalone: true,
imports: [NzAvatarComponent, NzTooltipDirective]
})
export class AvatarListComponent implements AfterViewInit, OnChanges {
Expand Down
10 changes: 4 additions & 6 deletions packages/abc/avatar-list/avatar-list.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@

import { createTestContext } from '@delon/testing';

import { AvatarListModule } from './avatar-list.module';
import { AvatarListItemComponent } from './avatar-list-item.component';
import { AvatarListComponent } from './avatar-list.component';

describe('abc: avatar-list', () => {
let fixture: ComponentFixture<TestComponent>;
let dl: DebugElement;
let context: TestComponent;
beforeEach(() => {
TestBed.configureTestingModule({
imports: [AvatarListModule],
declarations: [TestComponent]
});
({ fixture, dl, context } = createTestContext(TestComponent));
fixture.detectChanges();
});
Expand Down Expand Up @@ -74,7 +71,8 @@
<avatar-list-item tips="Cipchk" text="Cipchk" />
<avatar-list-item tips="heart-o" />
</avatar-list>
`
`,
imports: [AvatarListItemComponent, AvatarListComponent]

Check warning on line 75 in packages/abc/avatar-list/avatar-list.spec.ts

View workflow job for this annotation

GitHub Actions / lint

'AvatarListComponent' is deprecated. Will be removed in v20, Please use `nz-avatar-group` instead
})
class TestComponent {
size: 'large' | 'small' | 'mini' | 'default' = 'default';
Expand Down
1 change: 0 additions & 1 deletion packages/abc/cell/cell.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ import type { CellDefaultText, CellOptions, CellTextResult, CellValue } from './
preserveWhitespaces: false,
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
standalone: true,
imports: [
FormsModule,
NgTemplateOutlet,
Expand Down
17 changes: 11 additions & 6 deletions packages/abc/cell/cell.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Component, DebugElement, ViewChild } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserModule, By, DomSanitizer } from '@angular/platform-browser';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { NoopAnimationsModule, provideNoopAnimations } from '@angular/platform-browser/animations';
import { Router } from '@angular/router';
import { of } from 'rxjs';

import { cleanCdkOverlayHtml, createTestContext } from '@delon/testing';
import { WINDOW } from '@delon/util/token';
import { NzSafeAny } from 'ng-zorro-antd/core/types';
import { NzIconTestModule } from 'ng-zorro-antd/icon/testing';
import type { NzSafeAny } from 'ng-zorro-antd/core/types';
import { provideNzIconsTesting } from 'ng-zorro-antd/icon/testing';
import { NzImageService } from 'ng-zorro-antd/image';
import { NzTooltipDirective } from 'ng-zorro-antd/tooltip';

Expand All @@ -28,7 +28,8 @@ describe('abc: cell', () => {

const moduleAction = (): void => {
TestBed.configureTestingModule({
imports: [CellModule, NoopAnimationsModule, BrowserModule, NzIconTestModule],
providers: [provideNzIconsTesting(), provideNoopAnimations()],
imports: [CellModule, BrowserModule],
declarations: [TestComponent, TestWidget]
});
};
Expand Down Expand Up @@ -355,7 +356,9 @@ describe('abc: cell', () => {
});

@Component({
template: `{{ data.result.text }}-{{ data.options.widget.data }}`
template: `{{ data.result.text }}-{{ data.options.widget.data }}`,
// eslint-disable-next-line @angular-eslint/prefer-standalone
standalone: false
})
class TestWidget {
static readonly KEY = 'test';
Expand All @@ -373,7 +376,9 @@ class TestWidget {
[loading]="loading"
[disabled]="disabled"
/>
`
`,
// eslint-disable-next-line @angular-eslint/prefer-standalone
standalone: false
})
class TestComponent {
@ViewChild('comp', { static: true })
Expand Down
Loading
Loading