Merge branch 'vnext' into ibarakov/fix-avatar-styling

Author: onlyexeption

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
 }

live-editing/configs/BaseConfig.ts

@@ -2,11 +2,11 @@ export const BaseAppConfig = {
     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': 'provideIgniteIntl()', 'import': 'igniteui-angular' }
+        { 'provider': 'provideIgniteIntl()', 'import': 'igniteui-angular' },
+        { 'provider': 'provideRouter([])', 'import': '@angular/router' }
     ],
     routesConfig: {
         router: false

live-editing/configs/GridCRMConfigGenerator.ts

@@ -21,11 +21,11 @@ export class GridCRMConfigGenerator implements IConfigGenerator {
             appConfig: {
                 modules: [
                     { 'module': 'BrowserModule', 'import': '@angular/platform-browser' },
-                    { 'module': 'FormsModule', 'import': '@angular/forms' },
-                    { 'module': 'HammerModule', 'import': '@angular/platform-browser' }
+                    { 'module': 'FormsModule', 'import': '@angular/forms' }
                 ],
                 providers: [
-                    { 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
+                    { 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' },
+                    { 'provider': 'provideRouter([])', 'import': '@angular/router' }
                 ]
             }
             /*appConfig: BaseAppConfig*/

live-editing/configs/app-dv-configs/DVGridConfig.ts

@@ -67,7 +67,7 @@ export class DVGridConfigGenerator implements IConfigGenerator {
         configs.push(new Config({
             component: 'FinJSDemoComponent',
             dependenciesType: DependenciesType.Charts,
-            additionalDependencies: ['@microsoft/signalr'],
+            additionalDependencies: ['@microsoft/signalr', 'igniteui-angular-charts', 'igniteui-angular-core'],
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/projects/app-lob/src/app/services/financial.service.ts',
                 '/projects/app-lob/src/app/services/signal-r.service.ts',
                 '/projects/app-lob/src/app/data/financialData.ts', '/projects/app-lob/src/app/grid-finjs/controllers.component.ts',