build: remove custom-webpack (#8553)

NG-ZORRO · May 31, 2024 · 710e20e · 710e20e
1 parent c6e7bd7
commit 710e20e
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 73 deletions.
diff --git a/angular.json b/angular.json
@@ -185,11 +185,9 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-builders/custom-webpack:karma",
+          "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "customWebpackConfig": {
-              "path": "custom-webpack-spec.config.js"
-            },
+            "inlineStyleLanguage": "less",
             "fileReplacements": [
               {
                 "replace": "components/core/environments/environment.ts",

diff --git a/components/anchor/anchor.spec.ts b/components/anchor/anchor.spec.ts
@@ -1,12 +1,12 @@
 /* eslint-disable */
 // eslint-disable
-import { fakeAsync, tick, TestBed, ComponentFixture } from '@angular/core/testing';
 import { Component, DebugElement, ViewChild } from '@angular/core';
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NzScrollService } from 'ng-zorro-antd/core/services';
-import { NzAnchorModule } from './anchor.module';
-import { NzAnchorComponent } from './anchor.component';
 import { NzDirectionVHType } from 'ng-zorro-antd/core/types';
+import { NzAnchorComponent } from './anchor.component';
+import { NzAnchorModule } from './anchor.module';
 
 const throttleTime = 51;
 
@@ -350,7 +350,10 @@ describe('anchor', () => {
       <h2 id="basic-target"></h2>
     </div>
   `,
-  styleUrls: ['./style/patch.less']
+  styles: `
+    @import '../style/testing.less';
+    @import './style/patch.less';
+  `
 })
 export class TestComponent {
   @ViewChild(NzAnchorComponent, { static: false }) comp!: NzAnchorComponent;
@@ -362,7 +365,7 @@ export class TestComponent {
   nzContainer: any = null;
   nzCurrentAnchor?: string;
   nzDirection: NzDirectionVHType = 'vertical';
-  _click() {}
-  _change() {}
-  _scroll() {}
+  _click() { }
+  _change() { }
+  _scroll() { }
 }
diff --git a/components/avatar/avatar.spec.ts b/components/avatar/avatar.spec.ts
@@ -1,5 +1,5 @@
 import { Component, DebugElement, ViewChild } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
 import { createFakeEvent } from 'ng-zorro-antd/core/testing';
@@ -297,7 +297,10 @@ function getScaleFromCSSTransform(transform: string): number {
       [nzAlt]="nzAlt"
     ></nz-avatar>
   `,
-  styleUrls: ['./style/index.less']
+  styles: `
+    @import '../style/testing.less';
+    @import './style/index.less';
+  `
 })
 class TestAvatarComponent {
   @ViewChild('comp', { static: false }) comp!: NzAvatarComponent;

diff --git a/components/style/testing.less b/components/style/testing.less
@@ -0,0 +1,3 @@
+// This file is only used to set the @root-entry-name variable in a test environment.
+
+@import './default.less';
diff --git a/components/table/src/testing/table.spec.ts b/components/table/src/testing/table.spec.ts
@@ -1,6 +1,6 @@
 import { BidiModule, Dir } from '@angular/cdk/bidi';
 import { Component, DebugElement, Injector, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
 import { NzI18nService } from 'ng-zorro-antd/i18n';
@@ -431,7 +431,10 @@ interface ScrollTestDataItem {
     </div>
   `,
   encapsulation: ViewEncapsulation.None,
-  styleUrls: ['../../../style/entry.less']
+  styles: `
+    @import '../../../style/testing.less';
+    @import '../../../style/entry.less';
+  `
 })
 export class NzTestTableScrollComponent implements OnInit {
   @ViewChild(NzTableComponent, { static: false }) nzTableComponent!: NzTableComponent<ScrollTestDataItem>;

diff --git a/components/tabs/tabset.component.spec.ts b/components/tabs/tabset.component.spec.ts
@@ -1039,7 +1039,11 @@ class DynamicTabsTestComponent {
     </div>
   `,
   encapsulation: ViewEncapsulation.None,
-  styleUrls: ['../style/entry.less', './style/entry.less']
+  styles: `
+    @import '../style/testing.less';
+    @import '../style/entry.less';
+    @import './style/entry.less';
+  `
 })
 class ScrollableTabsTestComponent {
   selectedIndex = 0;

diff --git a/components/time-picker/time-picker-panel.component.spec.ts b/components/time-picker/time-picker-panel.component.spec.ts
@@ -1,5 +1,5 @@
 import { ApplicationRef, Component, DebugElement, NO_ERRORS_SCHEMA, ViewChild, ViewEncapsulation } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, flush, tick, waitForAsync } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 
@@ -367,7 +367,11 @@ describe('time-picker-panel', () => {
       [nzHourStep]="hourStep"
     ></nz-time-picker-panel>
   `,
-  styleUrls: ['../style/index.less', './style/index.less'],
+  styles: `
+    @import '../style/testing.less';
+    @import '../style/index.less';
+    @import './style/index.less';
+  `,
   imports: [NzTimePickerPanelComponent, FormsModule],
   standalone: true
 })
@@ -398,7 +402,11 @@ export class NzTestTimePanelComponent {
       [nzHourStep]="hourStep"
     ></nz-time-picker-panel>
   `,
-  styleUrls: ['../style/index.less', './style/index.less'],
+  styles: `
+    @import '../style/testing.less';
+    @import '../style/index.less';
+    @import './style/index.less';
+  `,
   imports: [NzTimePickerPanelComponent, FormsModule],
   standalone: true
 })
@@ -444,7 +452,11 @@ export class NzTestTimePanelDisabledComponent {
       [format]="format"
     ></nz-time-picker-panel>
   `,
-  styleUrls: ['../style/index.less', './style/index.less'],
+  styles: `
+    @import '../style/testing.less';
+    @import '../style/index.less';
+    @import './style/index.less';
+  `,
   imports: [NzTimePickerPanelComponent, FormsModule],
   standalone: true
 })
@@ -468,7 +480,11 @@ export class NzTest12HourTimePanelComponent {
       [nzHideDisabledOptions]="false"
     ></nz-time-picker-panel>
   `,
-  styleUrls: ['../style/index.less', './style/index.less'],
+  styles: `
+    @import '../style/testing.less';
+    @import '../style/index.less';
+    @import './style/index.less';
+  `,
   imports: [NzTimePickerPanelComponent, FormsModule],
   standalone: true
 })

diff --git a/components/transfer/transfer.spec.ts b/components/transfer/transfer.spec.ts
@@ -10,7 +10,7 @@ import {
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -562,7 +562,10 @@ describe('transfer', () => {
       <p id="transfer-footer">footer</p>
     </ng-template>
   `,
-  styleUrls: ['./style/index.less'],
+  styles: `
+    @import '../style/testing.less';
+    @import './style/index.less';
+  `,
   encapsulation: ViewEncapsulation.None
 })
 class TestTransferComponent implements OnInit {

diff --git a/custom-webpack-spec.config.js b/custom-webpack-spec.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "ngx-quicklink": "^0.4.2"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "17.0.2",
     "@angular-devkit/build-angular": "^17.3.0",
     "@angular-devkit/core": "^17.3.0",
     "@angular-devkit/schematics": "^17.3.0",