chore: update configs and tests, cleanups

xidedix · xidedix · commit 97a6df1c1276 · 2025-01-10T18:33:26.000+01:00
diff --git a/angular.json b/angular.json
@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "coreui": {
+    "coreui-demo": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -20,10 +20,14 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/coreui/demo",
+            "outputPath": "dist/coreui-demo",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "@angular/localize/init",
+              "zone.js",
+              "zone.js/testing"
+            ],
             "tsConfig": "src/tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
@@ -73,25 +77,29 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "buildTarget": "coreui:build:production"
+              "buildTarget": "coreui-demo:build:production"
             },
             "development": {
-              "buildTarget": "coreui:build:development"
+              "buildTarget": "coreui-demo:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "buildTarget": "coreui:build"
+            "buildTarget": "coreui-demo:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "@angular/localize/init",
+              "zone.js",
+              "zone.js/testing"
+            ],
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
             "inlineStyleLanguage": "scss",
@@ -108,11 +116,11 @@
         "cypress-run": {
           "builder": "@cypress/schematic:cypress",
           "options": {
-            "devServerTarget": "coreui:serve"
+            "devServerTarget": "coreui-demo:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "coreui:serve:production"
+              "devServerTarget": "coreui-demo:serve:production"
             }
           }
         },
@@ -126,13 +134,13 @@
         "e2e": {
           "builder": "@cypress/schematic:cypress",
           "options": {
-            "devServerTarget": "coreui:serve",
+            "devServerTarget": "coreui-demo:serve",
             "watch": false,
             "headless": true
           },
           "configurations": {
             "production": {
-              "devServerTarget": "coreui:serve:production"
+              "devServerTarget": "coreui-demo:serve:production"
             }
           }
         }
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -4,5 +4,6 @@
   "compilerOptions": {
     "sourceMap": false,
     "types": ["cypress"],
-  }
+  },
+  "exclude": [],
 }
diff --git a/projects/coreui-angular/src/lib/breadcrumb/cui-breadcrumb.component.spec.ts b/projects/coreui-angular/src/lib/breadcrumb/cui-breadcrumb.component.spec.ts
@@ -1,5 +1,5 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { RouterModule } from '@angular/router';
 
 import { CuiBreadcrumbComponent } from './cui-breadcrumb.component';
 
@@ -9,7 +9,7 @@ describe('CuiBreadcrumbComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [RouterTestingModule.withRoutes([]), CuiBreadcrumbComponent],
+      imports: [RouterModule.forRoot([]), CuiBreadcrumbComponent],
     })
       .compileComponents();
   }));
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,18 +1,24 @@
-import { RouterTestingModule } from '@angular/router/testing';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { AppComponent } from './app.component';
+import {TestBed, waitForAsync} from '@angular/core/testing';
+import {RouterModule} from "@angular/router";
+import {AppComponent} from './app.component';
+
 describe('AppComponent', () => {
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-      imports: [ RouterTestingModule ]
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AppComponent],
+      imports: [RouterModule]
     }).compileComponents();
-  }));
+  });
+
   it('should create the app', waitForAsync(() => {
     const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
+    const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   }));
+
+  it(`should have as title 'CoreUI Angular Admin Template'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app.title).toEqual('CoreUI 2 for Angular 18');
+  });
 });
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,14 +1,15 @@
-import { Component, OnInit } from '@angular/core';
-import { Router, NavigationEnd } from '@angular/router';
+import {Component, OnInit} from '@angular/core';
+import {NavigationEnd, Router} from '@angular/router';
 
 @Component({
-  // tslint:disable-next-line
-  selector: 'body',
-  template: '<router-outlet></router-outlet>'
+  selector: 'app-root',
+  template: '<router-outlet />',
+  standalone: false
 })
 export class AppComponent implements OnInit {
-  title = 'CoreUI 2 for Angular 15';
-  constructor(private router: Router) { }
+  title = 'CoreUI 2 for Angular 18';
+
+  constructor(private router: Router) {}
 
   ngOnInit() {
     this.router.events.subscribe((evt) => {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,6 +1,6 @@
-import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { LocationStrategy, HashLocationStrategy } from '@angular/common';
+import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { AppComponent } from './app.component';
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
@@ -31,7 +31,7 @@ export const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [ RouterModule.forRoot(routes, {}) ],
+  imports: [ RouterModule.forRoot(routes) ],
   exports: [ RouterModule ]
 })
 export class AppRoutingModule {}
diff --git a/src/app/containers/default-layout/default-layout.component.html b/src/app/containers/default-layout/default-layout.component.html
@@ -27,6 +27,6 @@
   </app-aside>
 </div>
 <app-footer>
-  <span><a href="https://coreui.io">CoreUI</a> &copy; 2024 creativeLabs.</span>
+  <span><a href="https://coreui.io">CoreUI</a> &copy; 2025 creativeLabs.</span>
   <span class="ml-auto">Powered by <a href="https://coreui.io/angular">CoreUI 2 for Angular</a></span>
 </app-footer>
diff --git a/src/main.ts b/src/main.ts
@@ -1,3 +1,5 @@
+/// <reference types="@angular/localize" />
+
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
diff --git a/src/polyfills.ts b/src/polyfills.ts
diff --git a/src/scss/vendors/_variables.scss b/src/scss/vendors/_variables.scss
@@ -1,4 +1,4 @@
 // Override Boostrap variables
 @import "../variables";
-@import "~bootstrap/scss/mixins";
-@import "~@coreui/coreui/scss/variables";
+@import "bootstrap/scss/mixins";
+@import "@coreui/coreui/scss/variables";
diff --git a/src/test.ts b/src/test.ts
@@ -1,16 +1,13 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
+import {getTestBed} from '@angular/core/testing';
+import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(), {
-    teardown: { destroyAfterEach: false }
-}
+    teardown: {destroyAfterEach: false}
+  }
 );
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
@@ -4,7 +4,7 @@
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "baseUrl": "./",
-    "types": [],
+    "types": ["node"],
     "paths": {
       "@angular/*": [
         "../node_modules/@angular/*"
@@ -13,9 +13,12 @@
   },
   "files": [
     "main.ts",
-    "polyfills.ts"
   ],
   "include": [
     "**/*.d.ts"
+  ],
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
   ]
 }
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
@@ -4,13 +4,10 @@
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
     "baseUrl": "./",
-    "types": [
-      "jasmine"
-    ]
+    "types": ["jasmine"]
   },
   "files": [
-    "test.ts",
-    "polyfills.ts"
+    "test.ts"
   ],
   "include": [
     "**/*.spec.ts",
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,12 +3,16 @@
   "compileOnSave": false,
   "compilerOptions": {
     "baseUrl": "./",
+    "types": [
+      "@angular/localize"
+    ],
     "paths": {
       "coreui-angular": [
         "dist/coreui-angular"
       ]
     },
     "outDir": "./dist/out-tsc",
+    "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,
@@ -17,17 +21,16 @@
     "noFallthroughCasesInSwitch": true,
     "sourceMap": true,
     "declaration": false,
-    "downlevelIteration": true,
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "ES2022",
-    "module": "es2022",
+    "module": "ES2022",
     "typeRoots": [
       "node_modules/@types"
     ],
     "lib": [
-      "es2022",
+      "ES2022",
       "dom"
     ],
     "useDefineForClassFields": false
@@ -37,5 +40,10 @@
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true
-  }
+  },
+  "exclude": [
+    "./cypress/**/*.ts",
+    "./cypress/tsconfig.json",
+    "cypress-angular/**/*.ts",
+  ],
 }

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@`
`4`	`4`	`"compilerOptions": {`
`5`	`5`	`"sourceMap": false,`
`6`	`6`	`"types": ["cypress"],`
`7`		`- }`
	`7`	`+ },`
	`8`	`+ "exclude": [],`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/// <reference types="@angular/localize" />`
	`2`	`+`
`1`	`3`	`import { enableProdMode } from '@angular/core';`
`2`	`4`	`import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';`
`3`	`5`