Merge pull request #3986 from IgniteUI/vnext

Updating production with changes from 22

Author: ChronosSF

.browserslistrc

@@ -10,4 +10,4 @@ not > 0.5%
 not last 2 versions
 not dead
 not IE 9-11
-Safari >=15.7
+Safari >=16.4

.github/workflows/build-app-crm.yml

@@ -5,13 +5,6 @@ name: App CRM CI
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
-  push:
-    branches: [ master, vnext ]
-    paths:
-      - '**'
-      - '!src/**'
-      - '!live-editing/**'
-      - '!projects/app-lob/**'
   pull_request:
     branches: [ master, vnext ]
     paths:
@@ -27,19 +20,15 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x]
-
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - name: Use Node.js 24
+        uses: actions/setup-node@v6
         with:
-            node-version: ${{ matrix.node-version }}
+            node-version: 24
             cache: 'npm'
 
       - name: Npm add registry

.github/workflows/build-app-lob.yml

@@ -5,16 +5,6 @@ name: App LOB CI
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
-  push:
-    branches: [ master, vnext ]
-    paths:
-      - '**'
-      - '!src/**'
-      - '!live-editing/configs/**'
-      - 'live-editing/configs/app-dv-configs/**'
-      - '!live-editing/generators/**'
-      - 'live-editing/generators/AppDVConfigGenerators.ts'
-      - '!projects/app-crm/**'
   pull_request:
     branches: [ master, vnext ]
     paths:
@@ -32,19 +22,15 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x]
-
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - name: Use Node.js 24
+        uses: actions/setup-node@v6
         with:
-            node-version: ${{ matrix.node-version }}
+            node-version: 24
             cache: 'npm'
 
       - name: Npm add registry

.github/workflows/build-app.yml

@@ -8,11 +8,6 @@ permissions:
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
-  push:
-    branches: [ master, vnext ]
-    paths:
-      - '**'
-      - '!projects/**'
   pull_request:
     branches: [ master, vnext ]
     paths:
@@ -25,19 +20,15 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x]
-
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - name: Use Node.js 24
+        uses: actions/setup-node@v6
         with:
-            node-version: ${{ matrix.node-version }}
+            node-version: 24
             cache: 'npm'
 
       - name: Npm add registry

.github/workflows/cd-matrix.yml

@@ -50,16 +50,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ env.BRANCH_REF }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '22.x'
+          node-version: 24
 
       - name: Replace with licensed angular-extras
         shell: pwsh

eslint.config.js

@@ -0,0 +1,118 @@
+// @ts-check
+const tseslint = require("typescript-eslint");
+const angular = require("angular-eslint");
+
+// Rules carried over from the original .eslintrc.json
+const sharedTsRules = {
+  // angular-eslint rules not in the original config
+  "@angular-eslint/prefer-on-push-component-change-detection": "off",
+  "@angular-eslint/prefer-inject": "off",
+  "@angular-eslint/prefer-standalone": "off",
+  // explicit typescript-eslint rules from .eslintrc.json
+  "@typescript-eslint/array-type": ["error", { default: "array" }],
+  "no-unused-expressions": "off",
+  "@typescript-eslint/no-unused-expressions": "off",
+  "@typescript-eslint/dot-notation": "off",
+  "@typescript-eslint/no-this-alias": "error",
+  "@typescript-eslint/prefer-for-of": "off",
+  // explicit eslint core rules from .eslintrc.json
+  "arrow-parens": ["off", "always"],
+  "comma-dangle": "error",
+  "no-underscore-dangle": "off",
+  "id-blacklist": "error",
+  "no-bitwise": "off",
+  "no-duplicate-case": "error",
+  "no-duplicate-imports": "error",
+  "no-extra-bind": "error",
+  "no-fallthrough": "off",
+  "no-new-func": "error",
+  "no-redeclare": "error",
+  "no-return-await": "error",
+  "no-sequences": "error",
+  "no-sparse-arrays": "error",
+  "no-template-curly-in-string": "error",
+  "prefer-object-spread": "off",
+  "space-in-parens": ["error", "never"],
+};
+
+const subProjectRules = {
+  "@angular-eslint/component-selector": [
+    "error",
+    { type: "element", prefix: "app", style: "kebab-case" },
+  ],
+  "@angular-eslint/directive-selector": [
+    "error",
+    { type: "attribute", prefix: "app", style: "camelCase" },
+  ],
+};
+
+module.exports = tseslint.config(
+  // ── main app (src/) ──
+  {
+    files: ["src/**/*.ts"],
+    extends: [
+      tseslint.configs.base,
+      ...angular.configs.tsRecommended,
+    ],
+    processor: angular.processInlineTemplates,
+    languageOptions: {
+      parserOptions: {
+        project: ["tsconfig.json"],
+      },
+    },
+    rules: { ...sharedTsRules },
+  },
+  {
+    files: ["src/**/*.html"],
+    extends: [...angular.configs.templateRecommended],
+    rules: {},
+  },
+
+  // ── app-lob ──
+  {
+    files: ["projects/app-lob/**/*.ts"],
+    extends: [
+      tseslint.configs.base,
+      ...angular.configs.tsRecommended,
+    ],
+    processor: angular.processInlineTemplates,
+    languageOptions: {
+      parserOptions: {
+        project: [
+          "projects/app-lob/tsconfig.app.json",
+          "projects/app-lob/tsconfig.spec.json",
+        ],
+      },
+    },
+    rules: { ...sharedTsRules, ...subProjectRules },
+  },
+  {
+    files: ["projects/app-lob/**/*.html"],
+    extends: [...angular.configs.templateRecommended],
+    rules: {},
+  },
+
+  // ── app-crm ──
+  {
+    files: ["projects/app-crm/**/*.ts"],
+    extends: [
+      tseslint.configs.base,
+      ...angular.configs.tsRecommended,
+    ],
+    processor: angular.processInlineTemplates,
+    languageOptions: {
+      parserOptions: {
+        project: [
+          "projects/app-crm/tsconfig.app.json",
+          "projects/app-crm/tsconfig.spec.json",
+        ],
+      },
+    },
+    rules: { ...sharedTsRules, ...subProjectRules },
+  },
+  {
+    files: ["projects/app-crm/**/*.html"],
+    extends: [...angular.configs.templateRecommended],
+    rules: {},
+  }
+);

gulpfile.js

@@ -10,8 +10,10 @@ require('ts-node').register({
     transpileOnly: true,
     compilerOptions: {
         module: "commonjs",
-        moduleResolution: "node",
-        allowJs: true
+        moduleResolution: "node10",
+        allowJs: true,
+        rootDir: ".",
+        ignoreDeprecations: "6.0"
     }
 });
 

ignite-ui-cli.json

@@ -3,7 +3,7 @@
   "project": {
     "defaultPort": 4200,
     "framework": "angular",
-    "projectType": "igx-ts-legacy",
+    "projectType": "igx-ts",
     "projectTemplate": "side-nav",
     "theme": "Custom",
     "isBundle": false,

live-editing/configs/BadgeConfigGenerator.ts

@@ -33,20 +33,30 @@ export class BadgeConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/data-display/badge/"
         }));
 
+        // badge styling sample
         configs.push(new Config({
             component: 'BadgeStylingSampleComponent',
             additionalFiles: ["src/app/data-display/badge/model/member.model.ts", "src/app/data-display/badge/badge-styling-sample/layout.scss"],
             appConfig: BaseAppConfig,
             shortenComponentPathBy: "/data-display/badge/"
         }));
 
+        // badge dot sample
         configs.push(new Config({
             component: 'BadgeDotSampleComponent',
             additionalFiles: ["src/app/data-display/badge/model/member.model.ts", "src/app/data-display/badge/badge-dot-sample/badge-dot-sample.component.scss"],
             appConfig: BaseAppConfig,
             shortenComponentPathBy: "/data-display/badge/"
         }));
 
+        // badge outlined
+        configs.push(new Config({
+            component: 'BadgeOutlinedComponent',
+            additionalFiles: ["src/app/data-display/badge/model/member.model.ts"],
+            appConfig: BaseAppConfig,
+            shortenComponentPathBy: "/data-display/badge/"
+        }));
+
         return configs;
     }
 }

live-editing/configs/BaseConfig-AngularLocale.ts

@@ -2,10 +2,10 @@ export const BaseAppAngularLocaleConfig = {
     modules: [
         { 'module': 'BrowserModule', 'import': '@angular/platform-browser' },
         { 'module': 'FormsModule', 'import': '@angular/forms' },
-        { 'module': 'HammerModule', 'import': '@angular/platform-browser' },
     ],
     providers: [
-        { 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
+        { 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' },
+        { 'provider': 'provideRouter([])', 'import': '@angular/router' }
     ],
     router: false
 }