Skip to content

Commit

Permalink
Merge pull request #3 from dreyliky/2.x.x-alpha
Browse files Browse the repository at this point in the history
Actualize master branch
  • Loading branch information
dreyliky authored Apr 8, 2023
2 parents 29ede06 + 383fe5b commit e6413db
Show file tree
Hide file tree
Showing 833 changed files with 21,304 additions and 19,124 deletions.
14 changes: 5 additions & 9 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@
"error",
4,
{
"SwitchCase": 1
"SwitchCase": 1,
"MemberExpression": 1
}
],
"max-lines-per-function": [
Expand Down Expand Up @@ -247,35 +248,30 @@
"public-static-field",
"protected-static-field",
"private-static-field",
"public-decorated-field",
"protected-decorated-field",
"private-decorated-field",
"public-instance-field",
"protected-instance-field",
"private-instance-field",
"public-abstract-field",
"protected-abstract-field",
"private-abstract-field",
"public-constructor",
"protected-constructor",
"private-constructor",
"public-static-method",
"protected-static-method",
"private-static-method",
"public-instance-method",
"protected-instance-method",
"private-instance-method",
"public-abstract-method",
"protected-abstract-method",
"private-abstract-method"
"protected-abstract-method"
]
}
],
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-explicit-any": "off",
"@angular-eslint/no-host-metadata-property": "off"
"@angular-eslint/no-host-metadata-property": "off",
"@angular-eslint/no-input-rename": "off"
}
},
{
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ speed-measure-plugin*.json
.settings/
*.sublime-workspace

.vs

# IDE - VSCode
.vscode/*
!.vscode/settings.json
Expand All @@ -32,6 +34,7 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/src/assets/library-doc
/src/assets/showcase-doc
/.sass-cache
Expand Down
12 changes: 1 addition & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,23 @@
{
"workbench.iconTheme": "material-icon-theme",
"workbench.colorTheme": "Community Material Theme High Contrast",
"git.enableSmartCommit": true,
"git.confirmSync": false,
"typescript.updateImportsOnFileMove.enabled": "always",
"javascript.updateImportsOnFileMove.enabled": "always",
"explorer.compactFolders": false,
"explorer.confirmDragAndDrop": false,
"window.zoomLevel": 2,
"workbench.sideBar.location": "left",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.organizeImports": true
},
"editor.tabSize": 4,
"editor.insertSpaces": true,
"eslint.options": {
"extensions": [".ts", ".html"]
},
"diffEditor.ignoreTrimWhitespace": false,
"editor.detectIndentation": false,
"javascript.preferences.quoteStyle": "single",
"typescript.preferences.quoteStyle": "single",
"typescript.inlayHints.parameterNames.enabled": "all",
"editor.inlayHints.enabled": false,
"angular.view-engine": false,
"[markdown]": {
"editor.wordWrap": "off"
},
"editor.guides.bracketPairs": true,
"cSpell.enabled": true
"editor.guides.bracketPairs": true
}
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## [v. 2.0.0-alpha]

### Features

- Angular 15;
- Context Menu Module;
- Divider Module;
- Hint Module;
- Menu Bar Module;
- Selection Module;

### Changes

- Changed API for a lot of features to make it closer to native elements/approaches;
- Different modules for input merged to single InputModule;

## [v. 1.1.0-alpha]

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</td>

<td>
Components in operating systems style for Angular 12+.
Components in operating systems style for Angular 15.

Visit the <a href="https://ngx-os.io">ngx-os website</a> for general information, examples, demos and documentation.
</td>
Expand Down
56 changes: 24 additions & 32 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@
"changeDetection": "OnPush",
"style": "scss",
"prefix": "showcase"
},
"@schematics/angular:directive": {
"prefix": "corn",
"skipTests": true
},
"@schematics/angular:service": {
"skipTests": true
},
"@schematics/angular:pipe": {
"skipTests": true
}
},
"root": "",
Expand Down Expand Up @@ -52,7 +62,7 @@
}
],
"scripts": [
"node_modules/prismjs/prism.js"
"node_modules/prismjs/prism.js"
],
"vendorChunk": true,
"extractLicenses": false,
Expand Down Expand Up @@ -112,8 +122,7 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
Expand All @@ -126,19 +135,6 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand Down Expand Up @@ -167,7 +163,7 @@
"prefix": "os",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "src/app/library/tsconfig.lib.json",
"project": "src/app/library/ng-package.json"
Expand All @@ -181,30 +177,26 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/app/library/src/test.ts",
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "src/app/library/tsconfig.spec.json",
"karmaConfig": "src/app/library/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/app/library/tsconfig.lib.json",
"src/app/library/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "ngx-os-showcase",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
},
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
},
"cli": {
"analytics": "a5b959d3-8a09-468e-99b2-e7709f529db4"
}
}
}
Loading

0 comments on commit e6413db

Please sign in to comment.