Skip to content

Commit 2870600

Browse files
authored
Merge branch 'master' into powerkiki
2 parents fa30e2a + 156a16c commit 2870600

File tree

7 files changed

+2165
-800
lines changed

7 files changed

+2165
-800
lines changed

apps/ng2-charts-demo/project.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,8 @@
7171
},
7272
"lint": {
7373
"executor": "@nx/eslint:lint",
74-
"outputs": ["{options.outputFile}"],
7574
"options": {
76-
"lintFilePatterns": [
77-
"apps/ng2-charts-demo/**/*.ts",
78-
"apps/ng2-charts-demo/**/*.html"
79-
]
75+
"lintFilePatterns": ["{projectRoot}/**/*.ts", "{projectRoot}/**/*.html"]
8076
}
8177
},
8278
"test": {

apps/ng2-charts-demo/src/app/bar-chart/bar-chart.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class BarChartComponent {
2424
Chart.register(DataLabelsPlugin);
2525
}
2626

27-
public barChartOptions: ChartConfiguration['options'] = {
27+
public barChartOptions: ChartConfiguration<'bar'>['options'] = {
2828
// We use these empty structures as placeholders for dynamic theming.
2929
scales: {
3030
x: {},

libs/ng2-charts-schematics/project.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
},
2121
"lint": {
2222
"executor": "@nx/eslint:lint",
23-
"outputs": ["{options.outputFile}"],
2423
"options": {
25-
"lintFilePatterns": ["libs/ng2-charts-schematics/**/*.ts"]
24+
"lintFilePatterns": ["{projectRoot}/**/*.ts"]
2625
}
2726
},
2827
"test": {

libs/ng2-charts/project.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,8 @@
3131
},
3232
"lint": {
3333
"executor": "@nx/eslint:lint",
34-
"outputs": ["{options.outputFile}"],
3534
"options": {
36-
"lintFilePatterns": [
37-
"libs/ng2-charts/**/*.ts",
38-
"libs/ng2-charts/**/*.html"
39-
]
35+
"lintFilePatterns": ["{projectRoot}/**/*.ts", "{projectRoot}/**/*.html"]
4036
}
4137
}
4238
}

nx.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@
1414
"inputs": ["default", "^production"],
1515
"cache": true
1616
},
17-
"lint": {
18-
"inputs": [
19-
"default",
20-
"{workspaceRoot}/.eslintrc.json",
21-
"{workspaceRoot}/.eslintignore"
22-
],
23-
"cache": true
24-
},
2517
"@nx/jest:jest": {
2618
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
2719
"cache": true,
@@ -34,6 +26,14 @@
3426
"codeCoverage": true
3527
}
3628
}
29+
},
30+
"@nx/eslint:lint": {
31+
"inputs": [
32+
"default",
33+
"{workspaceRoot}/.eslintrc.json",
34+
"{workspaceRoot}/.eslintignore"
35+
],
36+
"cache": true
3737
}
3838
},
3939
"namedInputs": {

0 commit comments

Comments
 (0)