Skip to content

Commit fc3f265

Browse files
samuil4samuil4
authored
Merge pull request #981 from SQ-UI/develop
Finalize version 1.4.3
2 parents ce9888f + e92389f commit fc3f265

Some content is hidden

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

41 files changed

+25254
-29632
lines changed

‎.eslintrc.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [
4+
"projects/**/*"
5+
],
6+
"overrides": [
7+
{
8+
"files": [
9+
"*.ts"
10+
],
11+
"parserOptions": {
12+
"project": [
13+
"tsconfig.json",
14+
"e2e/tsconfig.json"
15+
],
16+
"createDefaultProgram": true
17+
},
18+
"extends": [
19+
"plugin:@angular-eslint/recommended",
20+
"plugin:@angular-eslint/template/process-inline-templates"
21+
],
22+
"rules": {
23+
"@angular-eslint/component-selector": [
24+
"error"
25+
],
26+
"@angular-eslint/directive-selector": [
27+
"error"
28+
]
29+
}
30+
},
31+
{
32+
"files": [
33+
"*.html"
34+
],
35+
"extends": [
36+
"plugin:@angular-eslint/template/recommended"
37+
],
38+
"rules": {}
39+
}
40+
]
41+
}

‎README.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,20 @@ Any types of public interfaces and services are also included.
3535
- [Live examples](http://bit.ly/ng-sq-ui-docs-live-examples)
3636
- [Troubleshooting](http://bit.ly/ng-sq-ui-docs-troubleshooting)
3737

38-
**Note:**
38+
**Note:**<br>
39+
For projects that use the View Engine, instead Ivy (Angular 10 ~ Angular 12), please use the following version for each package:
40+
41+
**@sq-ui/ng-sq-ui:** 1.3.3
42+
<br>
43+
**@sq-ui/ng-datetime-picker:** 1.1.2
44+
<br>
45+
**@sq-ui/ng-sq-common:** 1.1.5
46+
<br>
47+
**@sq-ui/ng-modal:** 1.1.2
48+
<br>
49+
**@sq-ui/ng-datatable:** 1.1.3
50+
51+
<br>
3952
For projects that use Angular version < 9, please use the following version for each package:
4053

4154
**@sq-ui/ng-sq-ui:** 1.1.5 <br>

‎angular.json‎

Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,23 @@
5252
"extractLicenses": true,
5353
"vendorChunk": false,
5454
"buildOptimizer": true
55-
}
56-
}
55+
},
56+
"development": {}
57+
},
58+
"defaultConfiguration": "production"
5759
},
5860
"serve": {
5961
"builder": "@angular-devkit/build-angular:dev-server",
60-
"options": {
61-
"browserTarget": "sq-ui:build"
62-
},
62+
"options": {},
6363
"configurations": {
6464
"production": {
6565
"browserTarget": "sq-ui:build:production"
66+
},
67+
"development": {
68+
"browserTarget": "sq-ui:build:development"
6669
}
67-
}
70+
},
71+
"defaultConfiguration": "development"
6872
},
6973
"extract-i18n": {
7074
"builder": "@angular-devkit/build-angular:extract-i18n",
@@ -111,14 +115,17 @@
111115
"e2e": {
112116
"builder": "@angular-devkit/build-angular:protractor",
113117
"options": {
114-
"protractorConfig": "e2e/protractor.conf.js",
115-
"devServerTarget": "sq-ui:serve"
118+
"protractorConfig": "e2e/protractor.conf.js"
116119
},
117120
"configurations": {
118121
"production": {
119122
"devServerTarget": "sq-ui:serve:production"
123+
},
124+
"development": {
125+
"devServerTarget": "sq-ui:serve:development"
120126
}
121-
}
127+
},
128+
"defaultConfiguration": "development"
122129
},
123130
"lint": {
124131
"builder": "@angular-devkit/build-angular:tslint",
@@ -142,13 +149,15 @@
142149
"options": {
143150
"tsConfig": "projects/ng-sq-ui/tsconfig.lib.json",
144151
"project": "projects/ng-sq-ui/ng-package.json"
145-
}
146-
, "configurations": {
152+
},
153+
"configurations": {
147154
"production": {
148155
"tsConfig": "projects/ng-sq-ui/tsconfig.lib.prod.json"
149-
}
150-
}
151-
},
156+
},
157+
"development": {}
158+
},
159+
"defaultConfiguration": "production"
160+
},
152161
"test": {
153162
"builder": "@angular-devkit/build-angular:karma",
154163
"options": {
@@ -159,14 +168,11 @@
159168
}
160169
},
161170
"lint": {
162-
"builder": "@angular-devkit/build-angular:tslint",
171+
"builder": "@angular-eslint/builder:lint",
163172
"options": {
164-
"tsConfig": [
165-
"projects/ng-sq-ui/tsconfig.lib.json",
166-
"projects/ng-sq-ui/tsconfig.spec.json"
167-
],
168-
"exclude": [
169-
"**/node_modules/**"
173+
"lintFilePatterns": [
174+
"projects/ng-sq-ui/**/*.ts",
175+
"projects/ng-sq-ui/**/*.html"
170176
]
171177
}
172178
}
@@ -183,13 +189,15 @@
183189
"options": {
184190
"tsConfig": "projects/ng-datetime-picker/tsconfig.lib.json",
185191
"project": "projects/ng-datetime-picker/ng-package.json"
186-
}
187-
, "configurations": {
192+
},
193+
"configurations": {
188194
"production": {
189195
"tsConfig": "projects/ng-datetime-picker/tsconfig.lib.prod.json"
190-
}
191-
}
192-
},
196+
},
197+
"development": {}
198+
},
199+
"defaultConfiguration": "production"
200+
},
193201
"test": {
194202
"builder": "@angular-devkit/build-angular:karma",
195203
"options": {
@@ -200,14 +208,11 @@
200208
}
201209
},
202210
"lint": {
203-
"builder": "@angular-devkit/build-angular:tslint",
211+
"builder": "@angular-eslint/builder:lint",
204212
"options": {
205-
"tsConfig": [
206-
"projects/ng-datetime-picker/tsconfig.lib.json",
207-
"projects/ng-datetime-picker/tsconfig.spec.json"
208-
],
209-
"exclude": [
210-
"**/node_modules/**"
213+
"lintFilePatterns": [
214+
"projects/ng-datetime-picker/**/*.ts",
215+
"projects/ng-datetime-picker/**/*.html"
211216
]
212217
}
213218
}
@@ -224,13 +229,15 @@
224229
"options": {
225230
"tsConfig": "projects/ng-datatable/tsconfig.lib.json",
226231
"project": "projects/ng-datatable/ng-package.json"
227-
}
228-
, "configurations": {
232+
},
233+
"configurations": {
229234
"production": {
230235
"tsConfig": "projects/ng-datatable/tsconfig.lib.prod.json"
231-
}
232-
}
233-
},
236+
},
237+
"development": {}
238+
},
239+
"defaultConfiguration": "production"
240+
},
234241
"test": {
235242
"builder": "@angular-devkit/build-angular:karma",
236243
"options": {
@@ -241,14 +248,11 @@
241248
}
242249
},
243250
"lint": {
244-
"builder": "@angular-devkit/build-angular:tslint",
251+
"builder": "@angular-eslint/builder:lint",
245252
"options": {
246-
"tsConfig": [
247-
"projects/ng-datatable/tsconfig.lib.json",
248-
"projects/ng-datatable/tsconfig.spec.json"
249-
],
250-
"exclude": [
251-
"**/node_modules/**"
253+
"lintFilePatterns": [
254+
"projects/ng-datatable/**/*.ts",
255+
"projects/ng-datatable/**/*.html"
252256
]
253257
}
254258
}
@@ -265,13 +269,15 @@
265269
"options": {
266270
"tsConfig": "projects/ng-sq-common/tsconfig.lib.json",
267271
"project": "projects/ng-sq-common/ng-package.json"
268-
}
269-
, "configurations": {
272+
},
273+
"configurations": {
270274
"production": {
271275
"tsConfig": "projects/ng-sq-common/tsconfig.lib.prod.json"
272-
}
273-
}
274-
},
276+
},
277+
"development": {}
278+
},
279+
"defaultConfiguration": "production"
280+
},
275281
"test": {
276282
"builder": "@angular-devkit/build-angular:karma",
277283
"options": {
@@ -282,14 +288,11 @@
282288
}
283289
},
284290
"lint": {
285-
"builder": "@angular-devkit/build-angular:tslint",
291+
"builder": "@angular-eslint/builder:lint",
286292
"options": {
287-
"tsConfig": [
288-
"projects/ng-sq-common/tsconfig.lib.json",
289-
"projects/ng-sq-common/tsconfig.spec.json"
290-
],
291-
"exclude": [
292-
"**/node_modules/**"
293+
"lintFilePatterns": [
294+
"projects/ng-sq-common/**/*.ts",
295+
"projects/ng-sq-common/**/*.html"
293296
]
294297
}
295298
}
@@ -306,13 +309,15 @@
306309
"options": {
307310
"tsConfig": "projects/ng-modal/tsconfig.lib.json",
308311
"project": "projects/ng-modal/ng-package.json"
309-
}
310-
, "configurations": {
312+
},
313+
"configurations": {
311314
"production": {
312315
"tsConfig": "projects/ng-modal/tsconfig.lib.prod.json"
313-
}
314-
}
315-
},
316+
},
317+
"development": {}
318+
},
319+
"defaultConfiguration": "production"
320+
},
316321
"test": {
317322
"builder": "@angular-devkit/build-angular:karma",
318323
"options": {
@@ -323,14 +328,11 @@
323328
}
324329
},
325330
"lint": {
326-
"builder": "@angular-devkit/build-angular:tslint",
331+
"builder": "@angular-eslint/builder:lint",
327332
"options": {
328-
"tsConfig": [
329-
"projects/ng-modal/tsconfig.lib.json",
330-
"projects/ng-modal/tsconfig.spec.json"
331-
],
332-
"exclude": [
333-
"**/node_modules/**"
333+
"lintFilePatterns": [
334+
"projects/ng-modal/**/*.ts",
335+
"projects/ng-modal/**/*.html"
334336
]
335337
}
336338
}

0 commit comments

Comments
 (0)