Skip to content

Commit 25ff4c8

Browse files
committedJan 17, 2020
chore: project config files cleanup
1 parent ceb5f23 commit 25ff4c8

12 files changed

+91
-113
lines changed
 

‎.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Editor configuration, see http://editorconfig.org
1+
# Editor configuration, see https://editorconfig.org
22
root = true
33

44
[*]
55
charset = utf-8
66
end_of_line = lf
7-
indent_size = 2
87
indent_style = space
8+
indent_size = 2
99
insert_final_newline = true
1010
trim_trailing_whitespace = true
1111

‎.gitignore

+31-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,46 @@
1-
# Misc
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
# Only exists if Bazel was run
8+
/bazel-out
9+
10+
# dependencies
11+
/node_modules
212
# package-lock.json
313

4-
# Folders to ignore
5-
node_modules
6-
/coverage
14+
# profiling files
15+
chrome-profiler-events*.json
16+
speed-measure-plugin*.json
717

818
# IDEs and editors
919
/.idea
20+
.project
21+
.classpath
22+
.c9/
23+
*.launch
24+
.settings/
25+
*.sublime-workspace
1026

1127
# IDE - VSCode
1228
.vscode/*
1329
!.vscode/settings.json
1430
!.vscode/tasks.json
1531
!.vscode/launch.json
1632
!.vscode/extensions.json
33+
.history/*
34+
35+
# misc
36+
/.sass-cache
37+
/connect.lock
38+
/coverage
39+
/libpeerconnection.log
40+
npm-debug.log
41+
yarn-error.log
42+
testem.log
43+
/typings
1744

1845
# System Files
1946
.DS_Store

‎angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
}
126126
},
127127
"@coreui/angular": {
128+
"projectType": "library",
128129
"root": "projects/coreui/angular",
129130
"sourceRoot": "projects/coreui/angular/src",
130-
"projectType": "library",
131131
"prefix": "lib",
132132
"architect": {
133133
"build": {

‎browserslist

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
last 2 versions
77
Firefox ESR
88
not dead
9+
IE 10-11
910
# IE 9-11

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"scripts": {
1818
"ng": "ng",
1919
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
20-
"start": "ng serve",
2120
"build-lib": "ng build @coreui/angular --prod",
22-
"test": "ng test",
2321
"test-lib": "ng test @coreui/angular",
22+
"start": "ng serve",
23+
"test": "ng test",
2424
"lint": "ng lint",
2525
"e2e": "ng e2e",
2626
"publish": "cd dist/@coreui/angular/ && npm publish",

‎projects/coreui/angular/karma.conf.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ module.exports = function (config) {
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
dir: require('path').join(__dirname, '../../../coverage'),
20-
reports: ['html', 'lcovonly'],
19+
dir: require('path').join(__dirname, '../../../coverage/coreui/angular'),
20+
reports: ['html', 'lcovonly', 'text-summary'],
2121
fixWebpackSourcePaths: true
2222
},
2323
reporters: ['progress', 'kjhtml'],
@@ -26,6 +26,7 @@ module.exports = function (config) {
2626
logLevel: config.LOG_INFO,
2727
autoWatch: true,
2828
browsers: ['Chrome'],
29-
singleRun: false
29+
singleRun: false,
30+
restartOnFileChange: true
3031
});
3132
};

‎projects/coreui/angular/src/test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'core-js/es7/reflect';
43
import 'zone.js/dist/zone';
54
import 'zone.js/dist/zone-testing';
65
import { getTestBed } from '@angular/core/testing';

‎projects/coreui/angular/tsconfig.lib.prod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"angularCompilerOptions": {
44
"enableIvy": false
55
}
6-
}
6+
}

‎projects/coreui/angular/tsconfig.spec.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
]
99
},
1010
"files": [
11-
"src/test.ts",
12-
"../../../src/polyfills.ts"
11+
"src/test.ts"
1312
],
1413
"include": [
1514
"**/*.spec.ts",

‎projects/coreui/angular/tslint.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"extends": "../../../tslint.json",
33
"rules": {
44
"directive-selector": [
5-
true,
6-
"attribute",
7-
"app",
8-
"camelCase"
5+
true,
6+
"attribute",
7+
"app",
8+
"camelCase"
99
],
1010
"component-selector": [
11-
true,
12-
"element",
13-
"app",
14-
"kebab-case"
11+
true,
12+
"element",
13+
"app",
14+
"kebab-case"
1515
],
1616
"forin": false
1717
}

‎tsconfig.json

+13-15
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,30 @@
22
"compileOnSave": false,
33
"compilerOptions": {
44
"baseUrl": "./",
5-
"importHelpers": true,
6-
"module": "esnext",
7-
"outDir": "./dist/out-tsc",
5+
"outDir": "./dist",
86
"sourceMap": true,
97
"declaration": false,
10-
"moduleResolution": "node",
11-
"emitDecoratorMetadata": true,
8+
"downlevelIteration": true,
129
"experimentalDecorators": true,
10+
"module": "esnext",
11+
"moduleResolution": "node",
12+
"importHelpers": true,
1313
"target": "es2015",
1414
"typeRoots": [
1515
"node_modules/@types"
1616
],
1717
"lib": [
18-
"esnext",
18+
"es2018",
1919
"dom"
2020
],
2121
"paths": {
22-
"coreui-angular": [
23-
"dist/coreui-angular"
24-
],
25-
"angular": [
26-
"dist/angular"
27-
],
28-
"angular/*": [
29-
"dist/angular/*"
22+
"@coreui/angular": [
23+
"dist/coreui/angular"
3024
]
3125
}
26+
},
27+
"angularCompilerOptions": {
28+
"fullTemplateTypeCheck": true,
29+
"strictInjectionParameters": true
3230
}
33-
}
31+
}

‎tslint.json

+27-74
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,20 @@
11
{
2+
"extends": "tslint:recommended",
23
"rulesDirectory": [
3-
"node_modules/codelyzer"
4+
"codelyzer"
45
],
56
"rules": {
6-
"arrow-return-shorthand": true,
7-
"callable-types": true,
8-
"class-name": true,
9-
"comment-format": [
10-
true,
11-
"check-space"
12-
],
13-
"curly": true,
7+
"array-type": false,
8+
"arrow-parens": false,
149
"deprecation": {
15-
"severity": "warn"
10+
"severity": "warning"
1611
},
17-
"eofline": true,
18-
"forin": true,
1912
"import-blacklist": [
2013
true,
2114
"rxjs/Rx"
2215
],
23-
"import-spacing": true,
24-
"indent": [
25-
true,
26-
"spaces"
27-
],
28-
"interface-over-type-literal": true,
29-
"label-position": true,
16+
"interface-name": false,
17+
"max-classes-per-file": false,
3018
"max-line-length": [
3119
true,
3220
140
@@ -43,8 +31,7 @@
4331
]
4432
}
4533
],
46-
"no-arg": true,
47-
"no-bitwise": true,
34+
"no-consecutive-blank-lines": false,
4835
"no-console": [
4936
true,
5037
"debug",
@@ -53,77 +40,43 @@
5340
"timeEnd",
5441
"trace"
5542
],
56-
"no-construct": true,
57-
"no-debugger": true,
58-
"no-duplicate-super": true,
5943
"no-empty": false,
60-
"no-empty-interface": true,
61-
"no-eval": true,
6244
"no-inferrable-types": [
6345
true,
6446
"ignore-params"
6547
],
66-
"no-misused-new": true,
6748
"no-non-null-assertion": true,
68-
"no-shadowed-variable": true,
49+
"no-redundant-jsdoc": true,
6950
"no-string-literal": false,
70-
"no-string-throw": true,
7151
"no-switch-case-fall-through": true,
72-
"no-trailing-whitespace": true,
73-
"no-unnecessary-initializer": true,
74-
"no-unused-expression": true,
75-
"no-var-keyword": true,
76-
"object-literal-sort-keys": false,
77-
"one-line": [
52+
"no-var-requires": false,
53+
"object-literal-key-quotes": [
7854
true,
79-
"check-open-brace",
80-
"check-catch",
81-
"check-else",
82-
"check-whitespace"
55+
"as-needed"
8356
],
57+
"object-literal-sort-keys": false,
58+
"ordered-imports": false,
8459
"prefer-const": true,
8560
"quotemark": [
8661
true,
8762
"single"
8863
],
89-
"radix": true,
90-
"semicolon": [
91-
true,
92-
"always"
93-
],
94-
"triple-equals": [
95-
true,
96-
"allow-null-check"
97-
],
98-
"typedef-whitespace": [
99-
true,
100-
{
101-
"call-signature": "nospace",
102-
"index-signature": "nospace",
103-
"parameter": "nospace",
104-
"property-declaration": "nospace",
105-
"variable-declaration": "nospace"
106-
}
107-
],
108-
"unified-signatures": true,
64+
"trailing-comma": false,
65+
"component-class-suffix": true,
66+
"contextual-lifecycle": true,
67+
"directive-class-suffix": true,
68+
"no-conflicting-lifecycle": true,
10969
"variable-name": false,
110-
"whitespace": [
111-
true,
112-
"check-branch",
113-
"check-decl",
114-
"check-operator",
115-
"check-separator",
116-
"check-type"
117-
],
118-
"no-output-on-prefix": true,
119-
"no-inputs-metadata-property": true,
120-
"no-outputs-metadata-property": true,
121-
"no-host-metadata-property": true,
70+
"no-host-metadata-property": true,
12271
"no-input-rename": true,
72+
"no-inputs-metadata-property": true,
73+
"no-output-native": true,
74+
"no-output-on-prefix": true,
12375
"no-output-rename": true,
76+
"no-outputs-metadata-property": true,
77+
"template-banana-in-box": true,
78+
"template-no-negated-async": true,
12479
"use-lifecycle-interface": true,
125-
"use-pipe-transform-interface": true,
126-
"component-class-suffix": true,
127-
"directive-class-suffix": true
80+
"use-pipe-transform-interface": true
12881
}
12982
}

0 commit comments

Comments
 (0)
Please sign in to comment.