Skip to content

Commit

Permalink
Merge pull request #981 from SQ-UI/develop
Browse files Browse the repository at this point in the history
Finalize version 1.4.3
  • Loading branch information
samuil4 authored Sep 7, 2021
2 parents ce9888f + e92389f commit fc3f265
Show file tree
Hide file tree
Showing 41 changed files with 25,254 additions and 29,632 deletions.
41 changes: 41 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/component-selector": [
"error"
],
"@angular-eslint/directive-selector": [
"error"
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {}
}
]
}
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,20 @@ Any types of public interfaces and services are also included.
- [Live examples](http://bit.ly/ng-sq-ui-docs-live-examples)
- [Troubleshooting](http://bit.ly/ng-sq-ui-docs-troubleshooting)

**Note:**
**Note:**<br>
For projects that use the View Engine, instead Ivy (Angular 10 ~ Angular 12), please use the following version for each package:

**@sq-ui/ng-sq-ui:** 1.3.3
<br>
**@sq-ui/ng-datetime-picker:** 1.1.2
<br>
**@sq-ui/ng-sq-common:** 1.1.5
<br>
**@sq-ui/ng-modal:** 1.1.2
<br>
**@sq-ui/ng-datatable:** 1.1.3

<br>
For projects that use Angular version < 9, please use the following version for each package:

**@sq-ui/ng-sq-ui:** 1.1.5 <br>
Expand Down
140 changes: 71 additions & 69 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,23 @@
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"development": {}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "sq-ui:build"
},
"options": {},
"configurations": {
"production": {
"browserTarget": "sq-ui:build:production"
},
"development": {
"browserTarget": "sq-ui:build:development"
}
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
Expand Down Expand Up @@ -111,14 +115,17 @@
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "sq-ui:serve"
"protractorConfig": "e2e/protractor.conf.js"
},
"configurations": {
"production": {
"devServerTarget": "sq-ui:serve:production"
},
"development": {
"devServerTarget": "sq-ui:serve:development"
}
}
},
"defaultConfiguration": "development"
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
Expand All @@ -142,13 +149,15 @@
"options": {
"tsConfig": "projects/ng-sq-ui/tsconfig.lib.json",
"project": "projects/ng-sq-ui/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "projects/ng-sq-ui/tsconfig.lib.prod.json"
}
}
},
},
"development": {}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand All @@ -159,14 +168,11 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"projects/ng-sq-ui/tsconfig.lib.json",
"projects/ng-sq-ui/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
"lintFilePatterns": [
"projects/ng-sq-ui/**/*.ts",
"projects/ng-sq-ui/**/*.html"
]
}
}
Expand All @@ -183,13 +189,15 @@
"options": {
"tsConfig": "projects/ng-datetime-picker/tsconfig.lib.json",
"project": "projects/ng-datetime-picker/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "projects/ng-datetime-picker/tsconfig.lib.prod.json"
}
}
},
},
"development": {}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand All @@ -200,14 +208,11 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"projects/ng-datetime-picker/tsconfig.lib.json",
"projects/ng-datetime-picker/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
"lintFilePatterns": [
"projects/ng-datetime-picker/**/*.ts",
"projects/ng-datetime-picker/**/*.html"
]
}
}
Expand All @@ -224,13 +229,15 @@
"options": {
"tsConfig": "projects/ng-datatable/tsconfig.lib.json",
"project": "projects/ng-datatable/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "projects/ng-datatable/tsconfig.lib.prod.json"
}
}
},
},
"development": {}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand All @@ -241,14 +248,11 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"projects/ng-datatable/tsconfig.lib.json",
"projects/ng-datatable/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
"lintFilePatterns": [
"projects/ng-datatable/**/*.ts",
"projects/ng-datatable/**/*.html"
]
}
}
Expand All @@ -265,13 +269,15 @@
"options": {
"tsConfig": "projects/ng-sq-common/tsconfig.lib.json",
"project": "projects/ng-sq-common/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "projects/ng-sq-common/tsconfig.lib.prod.json"
}
}
},
},
"development": {}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand All @@ -282,14 +288,11 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"projects/ng-sq-common/tsconfig.lib.json",
"projects/ng-sq-common/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
"lintFilePatterns": [
"projects/ng-sq-common/**/*.ts",
"projects/ng-sq-common/**/*.html"
]
}
}
Expand All @@ -306,13 +309,15 @@
"options": {
"tsConfig": "projects/ng-modal/tsconfig.lib.json",
"project": "projects/ng-modal/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "projects/ng-modal/tsconfig.lib.prod.json"
}
}
},
},
"development": {}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand All @@ -323,14 +328,11 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"projects/ng-modal/tsconfig.lib.json",
"projects/ng-modal/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
"lintFilePatterns": [
"projects/ng-modal/**/*.ts",
"projects/ng-modal/**/*.html"
]
}
}
Expand Down
Loading

0 comments on commit fc3f265

Please sign in to comment.