Skip to content

Commit 46b73dc

Browse files
CopilotLipata
andcommitted
Merge master to resolve yarn.lock conflict
Co-authored-by: Lipata <[email protected]>
1 parent 6997ea4 commit 46b73dc

File tree

7 files changed

+35
-40
lines changed

7 files changed

+35
-40
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
# [14.6.3](https://github.com/IgniteUI/igniteui-cli/compare/v14.6.2...v14.6.3) (2025-10-09)
1+
# [14.6.4](https://github.com/IgniteUI/igniteui-cli/compare/v14.6.3...v14.6.4) (2025-10-14)
2+
3+
## What's Changed
4+
* ci: temporarily disable spec file linting by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1435
5+
6+
**Full Changelog**: https://github.com/IgniteUI/igniteui-cli/compare/v14.6.3...v14.6.4
7+
8+
29

310
## What's Changed
411
* fix(ng): move eslint eqeqeq rule by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1433

packages/cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "igniteui-cli",
3-
"version": "14.6.3",
3+
"version": "14.6.4",
44
"description": "CLI tool for creating Ignite UI projects",
55
"keywords": [
66
"CLI",
@@ -76,8 +76,8 @@
7676
"all": true
7777
},
7878
"dependencies": {
79-
"@igniteui/angular-templates": "~20.1.1463",
80-
"@igniteui/cli-core": "~14.6.3",
79+
"@igniteui/angular-templates": "~20.1.1464",
80+
"@igniteui/cli-core": "~14.6.4",
8181
"@inquirer/prompts": "^5.4.0",
8282
"@types/yargs": "^17.0.33",
8383
"chalk": "^5.3.0",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igniteui/cli-core",
3-
"version": "14.6.3",
3+
"version": "14.6.4",
44
"description": "Base types and functionality for Ignite UI CLI",
55
"repository": {
66
"type": "git",

packages/igx-templates/igx-ts/projects/_base/files/eslint.config.mjs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,27 @@ import { FlatCompat } from '@eslint/eslintrc';
33
const compat = new FlatCompat();
44

55
export default [
6-
...compat.extends('plugin:@angular-eslint/recommended', 'plugin:@angular-eslint/template/process-inline-templates'),
76
{
87
files: ['**/*.ts', '**/*.tsx'],
98
languageOptions: {
9+
parser: await import('@typescript-eslint/parser'),
1010
parserOptions: {
1111
project: ['tsconfig.json'],
1212
createDefaultProgram: true,
1313
},
1414
},
1515
rules: {
16-
'@angular-eslint/directive-selector': [
17-
'error',
18-
{ type: 'attribute', prefix: 'app', style: 'camelCase' },
19-
],
20-
'@angular-eslint/component-selector': [
21-
'error',
22-
{ type: 'element', prefix: 'app', style: 'kebab-case' },
23-
]
16+
// Basic TypeScript linting without Angular template processing
2417
},
2518
},
26-
...compat.extends('plugin:@angular-eslint/template/recommended'),
2719
{
2820
files: ['**/*.html'],
21+
...compat.extends('plugin:@angular-eslint/template/recommended')[0],
2922
rules: {
3023
eqeqeq: 'off'
3124
},
3225
},
3326
{
34-
ignores: ['projects/**/*']
27+
ignores: ['projects/**/*', '**/*.spec.ts']
3528
},
3629
];

packages/igx-templates/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igniteui/angular-templates",
3-
"version": "20.1.1463",
3+
"version": "20.1.1464",
44
"description": "Templates for Ignite UI for Angular projects and components",
55
"repository": {
66
"type": "git",
@@ -12,7 +12,7 @@
1212
"author": "Infragistics",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@igniteui/cli-core": "~14.6.3",
15+
"@igniteui/cli-core": "~14.6.4",
1616
"typescript": "~5.5.4"
1717
}
1818
}

packages/ng-schematics/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igniteui/angular-schematics",
3-
"version": "20.1.1463",
3+
"version": "20.1.1464",
44
"description": "Ignite UI for Angular Schematics for ng new and ng generate",
55
"repository": {
66
"type": "git",
@@ -20,8 +20,8 @@
2020
"dependencies": {
2121
"@angular-devkit/core": "^19.0.0",
2222
"@angular-devkit/schematics": "^19.0.0",
23-
"@igniteui/angular-templates": "~20.1.1463",
24-
"@igniteui/cli-core": "~14.6.3",
23+
"@igniteui/angular-templates": "~20.1.1464",
24+
"@igniteui/cli-core": "~14.6.4",
2525
"@schematics/angular": "~19.0.0",
2626
"minimatch": "^10.0.1",
2727
"rxjs": "^7.8.1"

yarn.lock

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -341,26 +341,26 @@
341341
integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
342342

343343
"@igniteui/angular-schematics@file:/home/runner/work/igniteui-cli/igniteui-cli/packages/ng-schematics":
344-
version "20.1.1463"
344+
version "20.1.1464"
345345
resolved "file:packages/ng-schematics"
346346
dependencies:
347347
"@angular-devkit/core" "^19.0.0"
348348
"@angular-devkit/schematics" "^19.0.0"
349-
"@igniteui/angular-templates" "~20.1.1463"
350-
"@igniteui/cli-core" "~14.6.3"
349+
"@igniteui/angular-templates" "~20.1.1464"
350+
"@igniteui/cli-core" "~14.6.4"
351351
"@schematics/angular" "~19.0.0"
352352
minimatch "^10.0.1"
353353
rxjs "^7.8.1"
354354

355-
"@igniteui/angular-templates@~20.1.1463", "@igniteui/angular-templates@file:/home/runner/work/igniteui-cli/igniteui-cli/packages/igx-templates":
356-
version "20.1.1463"
355+
"@igniteui/angular-templates@~20.1.1464", "@igniteui/angular-templates@file:/home/runner/work/igniteui-cli/igniteui-cli/packages/igx-templates":
356+
version "20.1.1464"
357357
resolved "file:packages/igx-templates"
358358
dependencies:
359-
"@igniteui/cli-core" "~14.6.3"
359+
"@igniteui/cli-core" "~14.6.4"
360360
typescript "~5.5.4"
361361

362-
"@igniteui/cli-core@~14.6.3", "@igniteui/cli-core@file:/home/runner/work/igniteui-cli/igniteui-cli/packages/core":
363-
version "14.6.3"
362+
"@igniteui/cli-core@~14.6.3", "@igniteui/cli-core@~14.6.4", "@igniteui/cli-core@file:/home/runner/work/igniteui-cli/igniteui-cli/packages/core":
363+
version "14.6.4"
364364
resolved "file:packages/core"
365365
dependencies:
366366
"@inquirer/prompts" "~5.4.0"
@@ -2728,9 +2728,9 @@ easy-extender@^2.3.4:
27282728
lodash "^4.17.10"
27292729

27302730
eazy-logger@^4.0.1:
2731-
version "4.0.1"
2732-
resolved "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz"
2733-
integrity sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==
2731+
version "4.1.0"
2732+
resolved "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.1.0.tgz"
2733+
integrity sha512-+mn7lRm+Zf1UT/YaH8WXtpU6PIV2iOjzP6jgKoiaq/VNrjYKp+OHZGe2znaLgDeFkw8cL9ffuaUm+nNnzcYyGw==
27342734
dependencies:
27352735
chalk "4.1.2"
27362736

@@ -4030,11 +4030,11 @@ ieee754@^1.1.13:
40304030
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
40314031

40324032
igniteui-cli@~14.6.3, "igniteui-cli@file:/home/runner/work/igniteui-cli/igniteui-cli/packages/cli":
4033-
version "14.6.3"
4033+
version "14.6.4"
40344034
resolved "file:packages/cli"
40354035
dependencies:
4036-
"@igniteui/angular-templates" "~20.1.1463"
4037-
"@igniteui/cli-core" "~14.6.3"
4036+
"@igniteui/angular-templates" "~20.1.1464"
4037+
"@igniteui/cli-core" "~14.6.4"
40384038
"@inquirer/prompts" "^5.4.0"
40394039
"@types/yargs" "^17.0.33"
40404040
chalk "^5.3.0"
@@ -6551,11 +6551,6 @@ readable-stream@~2.3.6:
65516551
string_decoder "~1.1.1"
65526552
util-deprecate "~1.0.1"
65536553

6554-
readdirp@^4.0.1:
6555-
version "4.1.2"
6556-
resolved "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz"
6557-
integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==
6558-
65596554
readdirp@~3.6.0:
65606555
version "3.6.0"
65616556
resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"

0 commit comments

Comments
 (0)