Skip to content

Commit 4eb4a78

Browse files
authored
Merge branch 'master' into copilot/refactor-side-navigation-auth-template
2 parents 2dd06a8 + f2e86d5 commit 4eb4a78

61 files changed

Lines changed: 107 additions & 289 deletions

Some content is hidden

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

.vscode/settings.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,5 @@
1818
"migrations/**/*.js": {"when": "$(basename).ts"},
1919
"schematics/**/*.js.map": true,
2020
"schematics/**/*.js": {"when": "$(basename).ts"}
21-
},
22-
"tslint.exclude": [
23-
"**/files/**/*.ts",
24-
"./output/**/*.ts"
25-
]
21+
}
2622
}

eslint.config.mjs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export default [
3232
rules: {
3333
'complexity': 'off',
3434
'eslint-plugin-import/no-extraneous-dependencies': 'warn',
35-
'eslint-plugin-import/no-internal-modules': 'warn',
3635
'eslint-plugin-import/order': [
3736
'off',
3837
{
@@ -93,7 +92,7 @@ export default [
9392
'no-bitwise': 'off',
9493
'no-caller': 'error',
9594
'no-cond-assign': 'error',
96-
'no-console': 'off',
95+
'no-console': 'error',
9796
'no-debugger': 'error',
9897
'no-duplicate-case': 'error',
9998
'no-duplicate-imports': 'error',
@@ -132,12 +131,19 @@ export default [
132131
'valid-typeof': 'off',
133132
},
134133
},
134+
{
135+
files: ['**/*.spec.ts', '**/*-spec.ts', 'spec/**/*.ts'],
136+
rules: {
137+
'eslint-plugin-import/no-extraneous-dependencies': 'off',
138+
'no-console': 'off',
139+
},
140+
},
135141
{
136142
ignores: [
137-
'/node_modules/**/*',
138-
'/coverage/**/*',
139-
'/output/**/*',
140-
'/packages/cli/templates/**/*',
143+
'node_modules/**/*',
144+
'coverage/**/*',
145+
'output/**/*',
146+
'packages/cli/templates/**/*',
141147
'**/files/**/*'
142148
]
143149
},

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
"resolve": "^1.22.8",
8484
"source-map-support": "^0.5.21",
8585
"ts-node": "^10.9.2",
86-
"tslint": "^5.11.0",
8786
"typescript": "~5.6.2",
8887
"typescript-json-schema": "^0.65.1"
8988
},

packages/cli/lib/PromptSession.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ export class PromptSession extends BasePromptSession {
9595

9696
protected async completeAndRun(port?: number) {
9797
await PackageManager.flushQueue(true);
98-
if (true) { // TODO: Make conditional?
99-
await start.start({ port });
100-
}
98+
await start.start({ port });
10199
}
102100

103101
protected async upgradePackages() {

packages/cli/lib/commands/generate.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ const command: CommandType = {
7979
command: "generate",
8080
describe: "generates custom template",
8181
templateManager: null,
82-
// tslint:disable:object-literal-sort-keys
8382
builder: yargs => {
8483
yargs
8584
.command({

packages/cli/lib/templates/jQueryTemplate.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import * as path from "path";
55
/**
66
* Template with specific implementation for jQuery projects
77
*/
8-
// tslint:disable-next-line:class-name
98
export class jQueryTemplate implements Template {
109
public components: string[];
1110
public controlGroup: string;
@@ -90,7 +89,6 @@ export class jQueryTemplate implements Template {
9089
return builder;
9190
}
9291
protected getScriptTags(): string {
93-
// tslint:disable-next-line:no-submodule-imports
9492
const config = require("@igniteui/cli-core/packages/components");
9593
let builder = "";
9694
builder += this.getJqueryDependenciesScriptTag();

packages/cli/migrations/update-13_1_0/index.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import * as path from "path";
2-
// tslint:disable:no-implicit-dependencies
32
import { EmptyTree } from "@angular-devkit/schematics";
4-
// tslint:disable-next-line:no-submodule-imports
53
import { SchematicTestRunner, UnitTestTree } from "@angular-devkit/schematics/testing";
64

75
describe("Update 13.1.0", () => {

packages/cli/migrations/update-13_1_0/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// tslint:disable:no-implicit-dependencies
21
import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
32

43
export default function(options: any): Rule {

packages/cli/migrations/update-2/index.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import * as path from "path";
22

3-
// tslint:disable:no-implicit-dependencies
43
import { EmptyTree } from "@angular-devkit/schematics";
5-
// tslint:disable-next-line:no-submodule-imports
64
import { SchematicTestRunner, UnitTestTree } from "@angular-devkit/schematics/testing";
75

86
describe("Update 2.0.0", () => {

packages/cli/migrations/update-2/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// tslint:disable:no-implicit-dependencies
21
import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
32

43
export default function(): Rule {

0 commit comments

Comments
 (0)