Skip to content

Commit

Permalink
Merge branch 'release/3.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
EndyKaufman committed Nov 17, 2018
2 parents b2995e8 + 1661a40 commit 29692a3
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 101 deletions.
156 changes: 85 additions & 71 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,73 +1,87 @@
<a name="3.2.3"></a>
## [3.2.3](https://github.com/rucken/cli/compare/3.2.2...3.2.3) (2018-09-28)


### Bug Fixes

* **deps:** Update dependencies ([1deeafd](https://github.com/rucken/cli/commit/1deeafd))



<a name="3.2.2"></a>
## [3.2.2](https://github.com/rucken/cli/compare/3.2.1...3.2.2) (2018-09-24)


### Bug Fixes

* **deps:** Update dependencies ([3e0ac40](https://github.com/rucken/cli/commit/3e0ac40))



<a name="3.2.1"></a>
## [3.2.1](https://github.com/rucken/cli/compare/3.2.0...3.2.1) (2018-09-23)


### Bug Fixes

* **deps:** Update dependencies ([edec746](https://github.com/rucken/cli/commit/edec746))



<a name="3.2.0"></a>
# [3.2.0](https://github.com/rucken/cli/compare/3.1.5...3.2.0) (2018-09-22)


### Features

* **schematics:** Add support use external and project schematics collections ([ef1c21d](https://github.com/rucken/cli/commit/ef1c21d))



<a name="3.1.5"></a>
## [3.1.5](https://github.com/rucken/cli/compare/3.1.4...3.1.5) (2018-09-20)


### Bug Fixes

* **deps:** Update dependencies ([ef06274](https://github.com/rucken/cli/commit/ef06274))



<a name="3.1.4"></a>
## [3.1.4](https://github.com/rucken/cli/compare/3.1.3...3.1.4) (2018-09-17)


### Bug Fixes

* **deps:** Update dependencies ([6c8e853](https://github.com/rucken/cli/commit/6c8e853))



<a name="3.1.3"></a>
## [3.1.3](https://github.com/rucken/cli/compare/3.1.2...3.1.3) (2018-08-31)


### Bug Fixes

* **generators:** Update resolve path for correct run schematics.js ([1de3944](https://github.com/rucken/cli/commit/1de3944))



# [3.3.0](https://github.com/rucken/cli/compare/3.2.3...3.3.0) (2018-11-17)


### Bug Fixes

* **nestjs-generators:** Add time options for change date time of migration generated for new entity ([bb821cc](https://github.com/rucken/cli/commit/bb821cc))


### Features

* **deps:** Update dependencies ([9e375c1](https://github.com/rucken/cli/commit/9e375c1))



<a name="3.2.3"></a>
## [3.2.3](https://github.com/rucken/cli/compare/3.2.2...3.2.3) (2018-09-28)


### Bug Fixes

* **deps:** Update dependencies ([1deeafd](https://github.com/rucken/cli/commit/1deeafd))



<a name="3.2.2"></a>
## [3.2.2](https://github.com/rucken/cli/compare/3.2.1...3.2.2) (2018-09-24)


### Bug Fixes

* **deps:** Update dependencies ([3e0ac40](https://github.com/rucken/cli/commit/3e0ac40))



<a name="3.2.1"></a>
## [3.2.1](https://github.com/rucken/cli/compare/3.2.0...3.2.1) (2018-09-23)


### Bug Fixes

* **deps:** Update dependencies ([edec746](https://github.com/rucken/cli/commit/edec746))



<a name="3.2.0"></a>
# [3.2.0](https://github.com/rucken/cli/compare/3.1.5...3.2.0) (2018-09-22)


### Features

* **schematics:** Add support use external and project schematics collections ([ef1c21d](https://github.com/rucken/cli/commit/ef1c21d))



<a name="3.1.5"></a>
## [3.1.5](https://github.com/rucken/cli/compare/3.1.4...3.1.5) (2018-09-20)


### Bug Fixes

* **deps:** Update dependencies ([ef06274](https://github.com/rucken/cli/commit/ef06274))



<a name="3.1.4"></a>
## [3.1.4](https://github.com/rucken/cli/compare/3.1.3...3.1.4) (2018-09-17)


### Bug Fixes

* **deps:** Update dependencies ([6c8e853](https://github.com/rucken/cli/commit/6c8e853))



<a name="3.1.3"></a>
## [3.1.3](https://github.com/rucken/cli/compare/3.1.2...3.1.3) (2018-08-31)


### Bug Fixes

* **generators:** Update resolve path for correct run schematics.js ([1de3944](https://github.com/rucken/cli/commit/1de3944))



<a name="3.1.2"></a>
## [3.1.2](https://github.com/rucken/cli/compare/3.1.1...3.1.2) (2018-08-31)

Expand Down Expand Up @@ -96,7 +110,7 @@

* **generators:** Add generator for create dto, entity, service and controller for NestJS backend ([fda37ba](https://github.com/rucken/cli/commit/fda37ba))
* **generators:** Add generator for create empty NestJS backend application ([f783954](https://github.com/rucken/cli/commit/f783954))
* **generators:** Add generator for create full fullstack project Angular6+ and NestJS ([bcce815](https://github.com/rucken/cli/commit/bcce815))
* **generators:** Add generator for create full fullstack project Angular7+ and NestJS ([bcce815](https://github.com/rucken/cli/commit/bcce815))
* **generators:** Change name: new->new:angular and entity->entity:angular ([210dde0](https://github.com/rucken/cli/commit/210dde0))


Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@rucken/cli
===========

Console tools for create and build [Angular6+](https://angular.io/) and [NestJS](https://nestjs.com/) application based on [Rucken](https://github.com/rucken) template
Console tools for create and build [Angular7+](https://angular.io/) and [NestJS](https://nestjs.com/) application based on [Rucken](https://github.com/rucken) template

[![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
[![Greenkeeper badge](https://badges.greenkeeper.io/rucken/cli.svg)](https://greenkeeper.io/)
Expand Down Expand Up @@ -46,7 +46,7 @@ $ rucken . -n table-name -f [name,title]
| Version | Changelog |
| ------------- | ------------- |
| [![GitHub tag](https://img.shields.io/github/tag/rucken/schematics.svg)](https://github.com/rucken/schematics) | [@rucken/schematics - Schematics collections for cli](https://github.com/rucken/schematics/blob/master/CHANGELOG.md) |
[![GitHub tag](https://img.shields.io/github/tag/rucken/core.svg)](https://github.com/rucken/core) | [@rucken/core - Frontend on Angular6+](https://github.com/rucken/core/blob/master/CHANGELOG.md) |
[![GitHub tag](https://img.shields.io/github/tag/rucken/core.svg)](https://github.com/rucken/core) | [@rucken/core - Frontend on Angular7+](https://github.com/rucken/core/blob/master/CHANGELOG.md) |
[![GitHub tag](https://img.shields.io/github/tag/rucken/core-nestjs.svg)](https://github.com/rucken/core-nestjs) | [@rucken/core-nestjs - Backend on NestJS](https://github.com/rucken/core-nestjs/blob/master/CHANGELOG.md) |

<!-- changelogsstop -->
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@rucken/cli",
"description": "Console tools for create and build Angular6+ and NestJS application based on Rucken template",
"version": "3.2.3",
"description": "Console tools for create and build Angular7+ and NestJS application based on Rucken template",
"version": "3.3.0",
"author": {
"name": "endy",
"email": "admin@site15.ru"
Expand All @@ -10,44 +10,44 @@
"rucken": "./bin/run"
},
"dependencies": {
"@angular-devkit/schematics-cli": "^0.8.3",
"@angular-devkit/schematics-cli": "^0.10.6",
"@biesbjerg/ngx-translate-extract": "^2.3.4",
"@oclif/command": "^1",
"@oclif/config": "^1",
"@oclif/plugin-help": "^2",
"@rucken/schematics": "^3.4.3",
"@rucken/schematics": "^3.5.0",
"@types/recursive-readdir": "^2.2.0",
"@types/replace-ext": "0.0.27",
"npm-run": "^5.0.1",
"po2json": "^0.4.5",
"po2json": "^1.0.0-alpha",
"recursive-readdir": "^2.2.2",
"replace-ext": "^1.0.0",
"sort-paths": "^1.1.1",
"stringify-object": "^3.2.2",
"stringify-object": "^3.3.0",
"tslib": "^1"
},
"devDependencies": {
"@angular-devkit/schematics": "^0.8.3",
"@angular-devkit/schematics": "^7.0.6",
"@oclif/dev-cli": "^1",
"@oclif/test": "^1",
"@oclif/tslint": "^3",
"@types/chai": "^4",
"@types/glob": "^7.1.1",
"@types/mocha": "^5",
"@types/node": "~10.11.2",
"@types/yargs": "^12.0.0",
"@types/node": "~10.12.9",
"@types/yargs": "^12.0.1",
"chai": "^4",
"conventional-changelog-cli": "^2.0.5",
"conventional-commits-detector": "^0.1.1",
"conventional-recommended-bump": "^4.0.1",
"conventional-changelog-cli": "^2.0.11",
"conventional-commits-detector": "^1.0.2",
"conventional-recommended-bump": "^4.0.4",
"globby": "^8",
"mocha": "^5",
"npm-run-all": "^4.1.3",
"nyc": "^13",
"rimraf": "^2.6.2",
"ts-node": "~7.0.1",
"tslint": "^5",
"typescript": "^2.9.2"
"typescript": "^3.1.6"
},
"engines": {
"node": ">=10",
Expand All @@ -61,7 +61,7 @@
"/oclif.manifest.json"
],
"keywords": [
"angular6",
"angular7",
"web application",
"seed",
"i18n",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/version-updater/folder1/default-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"node": ">=8",
"npm": ">=6.1.0"
},
"description": "Core with base class and admin entities for application maked on Angular6+",
"description": "Core with base class and admin entities for application maked on Angular7+",
"keywords": [
"ngx",
"angular",
"angular6",
"angular7",
"i18n",
"shared",
"services",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/version-updater/folder1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"node": ">=8",
"npm": ">=6.1.0"
},
"description": "Core with base class and admin entities for application maked on Angular6+",
"description": "Core with base class and admin entities for application maked on Angular7+",
"keywords": [
"ngx",
"angular",
"angular6",
"angular7",
"i18n",
"shared",
"services",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"node": ">=8",
"npm": ">=6.1.0"
},
"description": "Core with base class and admin entities for application maked on Angular6+",
"description": "Core with base class and admin entities for application maked on Angular7+",
"keywords": [
"ngx",
"angular",
"angular6",
"angular7",
"i18n",
"shared",
"services",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"node": ">=8",
"npm": ">=6.1.0"
},
"description": "Core with base class and admin entities for application maked on Angular6+",
"description": "Core with base class and admin entities for application maked on Angular7+",
"keywords": [
"ngx",
"angular",
"angular6",
"angular7",
"i18n",
"shared",
"services",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"node": ">=8",
"npm": ">=6.1.0"
},
"description": "Core with base class and admin entities for application maked on Angular6+",
"description": "Core with base class and admin entities for application maked on Angular7+",
"keywords": [
"ngx",
"angular",
"angular6",
"angular7",
"i18n",
"shared",
"services",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"node": ">=8",
"npm": ">=6.1.0"
},
"description": "Core with base class and admin entities for application maked on Angular6+",
"description": "Core with base class and admin entities for application maked on Angular7+",
"keywords": [
"ngx",
"angular",
"angular6",
"angular7",
"i18n",
"shared",
"services",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/version-updater/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"private": true,
"license": "MIT",
"author": "EndyKaufman <admin@site15.ru>",
"description": "Core with Admin UI for web and native application maked on Angular6+",
"description": "Core with Admin UI for web and native application maked on Angular7+",
"bugs": {
"url": "https://github.com/project/core/issues"
},
Expand All @@ -19,7 +19,7 @@
},
"keywords": [
"ngx",
"angular6",
"angular7",
"admin ui",
"web application",
"seed",
Expand Down

0 comments on commit 29692a3

Please sign in to comment.