Skip to content

Commit 7ef9249

Browse files
dobromirtsdobromirts
authored
Merge branch 'vnext' into vkombov/fix-3969
2 parents 8a7c43d + 1bf77ad commit 7ef9249

803 files changed

Lines changed: 14343 additions & 12792 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎eslint.config.js‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
// @ts-check
2+
const tseslint = require("typescript-eslint");
3+
const angular = require("angular-eslint");
4+
5+
// Rules carried over from the original .eslintrc.json
6+
const sharedTsRules = {
7+
// angular-eslint rules not in the original config
8+
"@angular-eslint/prefer-on-push-component-change-detection": "off",
9+
"@angular-eslint/prefer-inject": "off",
10+
"@angular-eslint/prefer-standalone": "off",
11+
// explicit typescript-eslint rules from .eslintrc.json
12+
"@typescript-eslint/array-type": ["error", { default: "array" }],
13+
"no-unused-expressions": "off",
14+
"@typescript-eslint/no-unused-expressions": "off",
15+
"@typescript-eslint/dot-notation": "off",
16+
"@typescript-eslint/no-this-alias": "error",
17+
"@typescript-eslint/prefer-for-of": "off",
18+
// explicit eslint core rules from .eslintrc.json
19+
"arrow-parens": ["off", "always"],
20+
"comma-dangle": "error",
21+
"no-underscore-dangle": "off",
22+
"id-blacklist": "error",
23+
"no-bitwise": "off",
24+
"no-duplicate-case": "error",
25+
"no-duplicate-imports": "error",
26+
"no-extra-bind": "error",
27+
"no-fallthrough": "off",
28+
"no-new-func": "error",
29+
"no-redeclare": "error",
30+
"no-return-await": "error",
31+
"no-sequences": "error",
32+
"no-sparse-arrays": "error",
33+
"no-template-curly-in-string": "error",
34+
"prefer-object-spread": "off",
35+
"space-in-parens": ["error", "never"],
36+
};
37+
38+
const subProjectRules = {
39+
"@angular-eslint/component-selector": [
40+
"error",
41+
{ type: "element", prefix: "app", style: "kebab-case" },
42+
],
43+
"@angular-eslint/directive-selector": [
44+
"error",
45+
{ type: "attribute", prefix: "app", style: "camelCase" },
46+
],
47+
};
48+
49+
module.exports = tseslint.config(
50+
// ── main app (src/) ──
51+
{
52+
files: ["src/**/*.ts"],
53+
extends: [
54+
tseslint.configs.base,
55+
...angular.configs.tsRecommended,
56+
],
57+
processor: angular.processInlineTemplates,
58+
languageOptions: {
59+
parserOptions: {
60+
project: ["tsconfig.json"],
61+
},
62+
},
63+
rules: { ...sharedTsRules },
64+
},
65+
{
66+
files: ["src/**/*.html"],
67+
extends: [...angular.configs.templateRecommended],
68+
rules: {},
69+
},
70+
71+
// ── app-lob ──
72+
{
73+
files: ["projects/app-lob/**/*.ts"],
74+
extends: [
75+
tseslint.configs.base,
76+
...angular.configs.tsRecommended,
77+
],
78+
processor: angular.processInlineTemplates,
79+
languageOptions: {
80+
parserOptions: {
81+
project: [
82+
"projects/app-lob/tsconfig.app.json",
83+
"projects/app-lob/tsconfig.spec.json",
84+
],
85+
},
86+
},
87+
rules: { ...sharedTsRules, ...subProjectRules },
88+
},
89+
{
90+
files: ["projects/app-lob/**/*.html"],
91+
extends: [...angular.configs.templateRecommended],
92+
rules: {},
93+
},
94+
95+
// ── app-crm ──
96+
{
97+
files: ["projects/app-crm/**/*.ts"],
98+
extends: [
99+
tseslint.configs.base,
100+
...angular.configs.tsRecommended,
101+
],
102+
processor: angular.processInlineTemplates,
103+
languageOptions: {
104+
parserOptions: {
105+
project: [
106+
"projects/app-crm/tsconfig.app.json",
107+
"projects/app-crm/tsconfig.spec.json",
108+
],
109+
},
110+
},
111+
rules: { ...sharedTsRules, ...subProjectRules },
112+
},
113+
{
114+
files: ["projects/app-crm/**/*.html"],
115+
extends: [...angular.configs.templateRecommended],
116+
rules: {},
117+
}
118+
);

‎gulpfile.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ require('ts-node').register({
1010
transpileOnly: true,
1111
compilerOptions: {
1212
module: "commonjs",
13-
moduleResolution: "node",
14-
allowJs: true
13+
moduleResolution: "node10",
14+
allowJs: true,
15+
rootDir: ".",
16+
ignoreDeprecations: "6.0"
1517
}
1618
});
1719

‎ignite-ui-cli.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"project": {
44
"defaultPort": 4200,
55
"framework": "angular",
6-
"projectType": "igx-ts-legacy",
6+
"projectType": "igx-ts",
77
"projectTemplate": "side-nav",
88
"theme": "Custom",
99
"isBundle": false,

0 commit comments

Comments
 (0)