diff --git a/packages/icons-angular/angular.json b/packages/icons-angular/angular.json index c971461fe..b86f7556a 100644 --- a/packages/icons-angular/angular.json +++ b/packages/icons-angular/angular.json @@ -11,12 +11,15 @@ "schematics": {}, "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", + "builder": "@angular-devkit/build-angular:application", "options": { - "outputPath": "dist/examples", + "outputPath": { + "base": "dist/examples" + }, "index": "examples/index.html", - "main": "examples/main.ts", - "polyfills": "examples/polyfills.ts", + "polyfills": [ + "examples/polyfills.ts" + ], "tsConfig": "examples/tsconfig.app.json", "assets": [ "examples/favicon.ico", @@ -33,12 +36,11 @@ ], "styles": ["examples/styles.css"], "scripts": [], - "vendorChunk": true, "extractLicenses": false, - "buildOptimizer": false, "sourceMap": true, "optimization": false, - "namedChunks": true + "namedChunks": true, + "browser": "examples/main.ts" }, "configurations": { "production": { @@ -58,9 +60,7 @@ "outputHashing": "all", "sourceMap": false, "namedChunks": false, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true + "extractLicenses": true } }, "defaultConfiguration": "" diff --git a/packages/icons-angular/examples/app/app.module.ts b/packages/icons-angular/examples/app/app.module.ts index c680a2610..485d70f7a 100644 --- a/packages/icons-angular/examples/app/app.module.ts +++ b/packages/icons-angular/examples/app/app.module.ts @@ -1,6 +1,6 @@ import { BrowserModule } from '@angular/platform-browser'; import { CommonModule } from '@angular/common'; -import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; +import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -8,24 +8,18 @@ import { AppInterceptor } from './app-interceptor.module'; import { IconModule } from '@ant-design/icons-angular'; import { AppComponent } from './app.component'; -@NgModule({ - declarations: [ - AppComponent - ], - imports: [ - CommonModule, - FormsModule, - BrowserModule, - IconModule, - HttpClientModule - ], - providers: [ - { - provide : HTTP_INTERCEPTORS, - useClass: AppInterceptor, - multi : true - }, - ], - bootstrap: [ AppComponent ] -}) +@NgModule({ declarations: [ + AppComponent + ], + bootstrap: [AppComponent], imports: [CommonModule, + FormsModule, + BrowserModule, + IconModule], providers: [ + { + provide: HTTP_INTERCEPTORS, + useClass: AppInterceptor, + multi: true + }, + provideHttpClient(withInterceptorsFromDi()), + ] }) export class AppModule { } diff --git a/packages/icons-angular/package.json b/packages/icons-angular/package.json index a49af9c2b..2c3aea259 100644 --- a/packages/icons-angular/package.json +++ b/packages/icons-angular/package.json @@ -16,26 +16,26 @@ "license": "MIT", "private": true, "dependencies": { - "@angular/common": "^17.0.1", - "@angular/core": "^17.0.1", + "@angular/common": "^18.0.0", + "@angular/core": "^18.0.0", "@ant-design/colors": "^7.0.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^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/compiler": "^17.0.1", - "@angular/compiler-cli": "^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/router": "^17.0.1", + "@angular-devkit/build-angular": "^18.0.1", + "@angular-eslint/builder": "^18.0.0-alpha.5", + "@angular-eslint/eslint-plugin": "^18.0.0-alpha.5", + "@angular-eslint/eslint-plugin-template": "^18.0.0-alpha.5", + "@angular-eslint/schematics": "^18.0.0-alpha.5", + "@angular-eslint/template-parser": "^18.0.0-alpha.5", + "@angular/animations": "^18.0.0", + "@angular/cli": "^18.0.1", + "@angular/compiler": "^18.0.0", + "@angular/compiler-cli": "^18.0.0", + "@angular/forms": "^18.0.0", + "@angular/language-service": "^18.0.0", + "@angular/platform-browser": "^18.0.0", + "@angular/platform-browser-dynamic": "^18.0.0", + "@angular/router": "^18.0.0", "@ant-design/icons-svg": "^4.0.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", @@ -57,11 +57,11 @@ "karma-jasmine-html-reporter": "^2.0.0", "karma-spec-reporter": "^0.0.36", "lodash": "^4.17.11", - "ng-packagr": "^17.0.0", + "ng-packagr": "^18.0.0", "prettier": "^2.8.8", "rxjs": "^7.8.0", "ts-node": "~10.9.0", - "typescript": "~5.2.2", + "typescript": "~5.4.5", "zone.js": "~0.14.2" } -} +} \ No newline at end of file diff --git a/packages/icons-angular/src/component/icon.spec.ts b/packages/icons-angular/src/component/icon.spec.ts index c653a2d68..4635edd6d 100644 --- a/packages/icons-angular/src/component/icon.spec.ts +++ b/packages/icons-angular/src/component/icon.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientModule } from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import { Component } from '@angular/core'; import { fakeAsync, flush, inject, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; @@ -136,9 +136,10 @@ describe('@ant-design/icons-angular', () => { describe('dynamic loading', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports : [ IconModule, HttpClientModule ], - declarations: [ IconTestComponent ] - }); + declarations: [IconTestComponent], + imports: [IconModule], + providers: [provideHttpClient(withInterceptorsFromDi())] +}); }); beforeEach(inject([ IconService ], (is: IconService) => { diff --git a/packages/icons-angular/src/package.json b/packages/icons-angular/src/package.json index 720fbaed1..52203baaf 100644 --- a/packages/icons-angular/src/package.json +++ b/packages/icons-angular/src/package.json @@ -6,16 +6,17 @@ "contributors": [ "Wendell Hu ", "Jørn Are Hatlelid ", - "MunMunMiao " + "MunMunMiao ", + "Nicoss54 " ], "dependencies": { "@ant-design/colors": "^7.0.0", "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^17.0.0", - "@angular/core": "^17.0.0", - "@angular/platform-browser": "^17.0.0", + "@angular/common": "^18.0.0", + "@angular/core": "^18.0.0", + "@angular/platform-browser": "^18.0.0", "rxjs": "^6.4.0 || ^7.4.0" } } diff --git a/packages/icons-angular/tsconfig.json b/packages/icons-angular/tsconfig.json index aea4146d2..da50c11e5 100644 --- a/packages/icons-angular/tsconfig.json +++ b/packages/icons-angular/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": "./", "outDir": "./dist/out-tsc", + "esModuleInterop": true, "sourceMap": false, "declaration": true, "module": "esnext",