From 5252b52bdaece9c3da3fcfecc85dd5e2ffde322f Mon Sep 17 00:00:00 2001 From: Jose Tomas Hernandez Lopez Date: Fri, 23 Feb 2024 09:12:26 +0100 Subject: [PATCH] fix: rename from devon4ts_node to devon4ts to match new org name and remove samples links --- .travis.yml | 12 ++--- .vscode/settings.json | 1 - CHANGELOG.asciidoc | 44 +++++++++---------- README.md | 19 ++++---- lerna.json | 12 ++--- main.yml | 12 ++--- package.json | 2 +- packages/common/README.md | 25 ++++------- packages/common/package.json | 14 +++--- packages/config/README.md | 25 ++++------- packages/config/package.json | 14 +++--- packages/logform/README.md | 25 ++++------- packages/logform/package.json | 14 +++--- packages/mailer/README.md | 25 ++++------- packages/mailer/package.json | 12 ++--- packages/schematics/.gitignore | 2 +- packages/schematics/README.md | 25 ++++------- packages/schematics/generators.json | 4 +- packages/schematics/package.json | 6 +-- packages/schematics/src/collection.json | 2 +- .../shared/logger/winston.logger.ts.template | 2 +- .../src/generators/mailer/generator.spec.ts | 2 +- .../src/generators/mailer/generator.ts | 4 +- .../src/generators/packagesVersion.ts | 8 ++-- 24 files changed, 133 insertions(+), 178 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e5eb8c3..1374b625 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ env: global: - ORG="devonfw" - EMAIL="icsddevonfwsupport.apps2@capgemini.com" - - REPO_SOURCE="devon4ts_node" - - REPO_DEST="devon4ts_node.wiki" + - REPO_SOURCE="devon4ts" + - REPO_DEST="devon4ts.wiki" - REPO_CONSOLIDATE="devonfw-guide" - GH_REPO_SOURCE="github.com/${ORG}/${REPO_SOURCE}.git" - GH_REPO_DEST="github.com/${ORG}/${REPO_DEST}.git" @@ -27,11 +27,11 @@ jobs: - grep -lr "link:[a-zA-Z0-9_.-]*.asciidoc.*" .| xargs -r sed -i "s/.asciidoc//g" # Terminate Travis CI build when no changes detected - | - if git diff-index --quiet HEAD && [ ! -n "$(git status -s)" ]; then - set +e - pkill -9 -P $$ &> /dev/null || true + if git diff-index --quiet HEAD && [ ! -n "$(git status -s)" ]; then + set +e + pkill -9 -P $$ &> /dev/null || true exit 0 - else + else git config user.email ${EMAIL} git config user.name ${USER} git status diff --git a/.vscode/settings.json b/.vscode/settings.json index ae267265..8aa401cb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,5 @@ "typescript.preferences.importModuleSpecifier": "relative", "typescript.preferences.quoteStyle": "single", "editor.formatOnSave": true, - "asciidoc.antora.enableAntoraSupport": true, "eslint.validate": ["json"] } diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index c0422910..71f5b31c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,6 +1,6 @@ -= devon4ts_node changelog += devon4ts changelog -This file documents all notable changes to https://github.com/devonfw/devon4ts_node[devon4ts_node]. +This file documents all notable changes to https://github.com/devonfw/devon4ts[devon4ts]. == 5.0 @@ -36,43 +36,43 @@ This file documents all notable changes to https://github.com/devonfw/devon4ts_n * Upgrade packages to work with NestJS 8. * Update @devon4node/config: change environment variables naming -* Moved samples to https://github.com/devonfw-sample/devon4ts_node-samples/ +* Moved samples to https://github.com/devonfw-sample/devon4ts-samples/ * Update @devon4node/schematics: ** Generate code compatible with NestJS 8 ** Remove CRUD schematic -** Make resource schematic compatible with devon4ts_node structure +** Make resource schematic compatible with devon4ts structure == 3.0 On this release we have added more options to cli new command and fixed some bugs. -* https://github.com/devonfw/devon4ts_node/pull/298[#298]: Fix cli project creation with uppercase and initialization. -* https://github.com/devonfw/devon4ts_node/pull/295[#295]: Add tests to custom schematics -* https://github.com/devonfw/devon4ts_node/pull/223[#223]: Add no interactive new project with modules command. -* https://github.com/devonfw/devon4ts_node/pull/214[#214]: Update swagger api decorators. +* https://github.com/devonfw/devon4ts/pull/298[#298]: Fix cli project creation with uppercase and initialization. +* https://github.com/devonfw/devon4ts/pull/295[#295]: Add tests to custom schematics +* https://github.com/devonfw/devon4ts/pull/223[#223]: Add no interactive new project with modules command. +* https://github.com/devonfw/devon4ts/pull/214[#214]: Update swagger api decorators. == 2.0 On this release the cli, packages and documentation have been updated, also fixed some bugs. -* https://github.com/devonfw/devon4ts_node/pull/108[#108]: Update cli documentation. -* https://github.com/devonfw/devon4ts_node/pull/107[#107]: Update the coding conventions guide. -* https://github.com/devonfw/devon4ts_node/pull/106[#106]: Remove autocomplete documentation as it is not working. -* https://github.com/devonfw/devon4ts_node/pull/71[#71]: Update schematics to generate new config module. -* https://github.com/devonfw/devon4ts_node/pull/69[#96]: First draft of the doc on the import of ESLint reports into SonarQube. +* https://github.com/devonfw/devon4ts/pull/108[#108]: Update cli documentation. +* https://github.com/devonfw/devon4ts/pull/107[#107]: Update the coding conventions guide. +* https://github.com/devonfw/devon4ts/pull/106[#106]: Remove autocomplete documentation as it is not working. +* https://github.com/devonfw/devon4ts/pull/71[#71]: Update schematics to generate new config module. +* https://github.com/devonfw/devon4ts/pull/69[#96]: First draft of the doc on the import of ESLint reports into SonarQube. == 1.11.0 -* https://github.com/devonfw/devon4ts_node/pull/69[#69]: Move from TSLint to ESLint. -* https://github.com/devonfw/devon4ts_node/pull/26[#26]: Update references to new CobiGen repository URL. -* https://github.com/devonfw/devon4ts_node/pull/25[#25]: Update package dependencies. -* https://github.com/devonfw/devon4ts_node/pull/24[#24]: Prettify on new project. Solved id's problem on migration. -* https://github.com/devonfw/devon4ts_node/pull/23[#23], https://github.com/devonfw/devon4ts_node/issues/22[#22]: Login as waiter waiter, fix waiter ID unique constraint. +* https://github.com/devonfw/devon4ts/pull/69[#69]: Move from TSLint to ESLint. +* https://github.com/devonfw/devon4ts/pull/26[#26]: Update references to new CobiGen repository URL. +* https://github.com/devonfw/devon4ts/pull/25[#25]: Update package dependencies. +* https://github.com/devonfw/devon4ts/pull/24[#24]: Prettify on new project. Solved id's problem on migration. +* https://github.com/devonfw/devon4ts/pull/23[#23], https://github.com/devonfw/devon4ts/issues/22[#22]: Login as waiter waiter, fix waiter ID unique constraint. == 1.0 On this release the cli, schematics, mailer module, common module and samples have been added, the documentation has been updated. -* https://github.com/devonfw/devon4ts_node/pull/17[#17], https://github.com/devonfw/devon4ts_node/pull/18[#18]: Add CLI, Schematics, Mailer module, Common module and Samples. -* https://github.com/devonfw/devon4ts_node/pull/16[#16]: Add Travis CI configuration for documentation workflow. -* https://github.com/devonfw/devon4ts_node/pull/13[#13]: Add License file and project docs -* https://github.com/devonfw/devon4ts_node/pull/11[#17]: Refactor devon4ts_node template. +* https://github.com/devonfw/devon4ts/pull/17[#17], https://github.com/devonfw/devon4ts/pull/18[#18]: Add CLI, Schematics, Mailer module, Common module and Samples. +* https://github.com/devonfw/devon4ts/pull/16[#16]: Add Travis CI configuration for documentation workflow. +* https://github.com/devonfw/devon4ts/pull/13[#13]: Add License file and project docs +* https://github.com/devonfw/devon4ts/pull/11[#17]: Refactor devon4ts template. diff --git a/README.md b/README.md index d2eb8338..12f45289 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -# devon4ts_node +# devon4ts [devonfw](https://www.devonfw.com/) is a platform which provides solutions to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions. devonfw is 100% Open Source (Apache License version 2.0) since the beginning of 2018. -devon4ts_node is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. +devon4ts is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. -![License](https://img.shields.io/npm/l/@devon4ts_node/cli) -![License](https://img.shields.io/npm/v/@devon4ts_node/cli) -![License](https://img.shields.io/librariesio/release/npm/@devon4ts_node/cli) -![License](https://img.shields.io/npm/dt/@devon4ts_node/cli) +![License](https://img.shields.io/npm/l/@devon4ts/cli) +![License](https://img.shields.io/npm/v/@devon4ts/cli) +![License](https://img.shields.io/librariesio/release/npm/@devon4ts/cli) +![License](https://img.shields.io/npm/dt/@devon4ts/cli) ## Documentation -You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts_node/wiki). +You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts/wiki). ## Code of conduct @@ -27,7 +27,4 @@ Visit [key principles document](https://github.com/devonfw/.github/blob/master/k ## Samples -- [Employee example](https://github.com/devonfw-sample/devon4ts_node-samples/tree/develop/employee): simple backend example for a employee management application. -- [Components example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/components-example): simple backend example which will show you the execution order of the devon4ts_node components. -- [GraphQL example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/graphql): simple GraphQL example with starter configuration. -- [My Thai Star](https://github.com/devonfw/my-thai-star/tree/develop/node): realistic example about the management of a restaurant. This example has also a frontend and it is compatible with other devonfw stacks. +You can find more information [here](https://devonfw.com/docs/typescript/current/nestjs/samples.html). diff --git a/lerna.json b/lerna.json index 44d1da4f..4869ad57 100644 --- a/lerna.json +++ b/lerna.json @@ -1,17 +1,11 @@ { - "packages": [ - "packages/common", - "packages/config", - "packages/logform", - "packages/mailer", - "packages/schematics" - ], + "packages": ["packages/common", "packages/config", "packages/logform", "packages/mailer", "packages/schematics"], "npmClient": "pnpm", "useWorkspaces": true, "version": "independent", "command": { "publish": { - "message": "chore(@devon4ts_node): publish new release" + "message": "chore(@devon4ts): publish new release" } } -} \ No newline at end of file +} diff --git a/main.yml b/main.yml index 93c8d378..e8e3b659 100644 --- a/main.yml +++ b/main.yml @@ -17,11 +17,11 @@ jobs: - grep -lr "link:[a-zA-Z0-9_.-]*.asciidoc.*" .| xargs -r sed -i "s/.asciidoc//g" # Terminate Travis CI build when no changes detected - | - if git diff-index --quiet HEAD && [ ! -n "$(git status -s)" ]; then - set +e - pkill -9 -P $$ &> /dev/null || true + if git diff-index --quiet HEAD && [ ! -n "$(git status -s)" ]; then + set +e + pkill -9 -P $$ &> /dev/null || true exit 0 - else + else git config user.email ${EMAIL} git config user.name ${USER} git status @@ -45,8 +45,8 @@ jobs: env: - ORG="devonfw" - EMAIL="icsddevonfwsupport.apps2@capgemini.com" - - REPO_SOURCE="devon4ts_node" - - REPO_DEST="devon4ts_node.wiki" + - REPO_SOURCE="devon4ts" + - REPO_DEST="devon4ts.wiki" - REPO_CONSOLIDATE="devonfw-guide" - GH_REPO_SOURCE="github.com/${ORG}/${REPO_SOURCE}.git" - GH_REPO_DEST="github.com/${ORG}/${REPO_DEST}.git" diff --git a/package.json b/package.json index 7ff06809..94f1feb0 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@devon4ts_node/devon4ts_node", + "name": "@devon4ts/devon4ts", "private": true, "license": "Apache-2.0", "scripts": { diff --git a/packages/common/README.md b/packages/common/README.md index f4b3d67d..43868da1 100644 --- a/packages/common/README.md +++ b/packages/common/README.md @@ -1,21 +1,21 @@ -# devon4ts_node +# devon4ts [devonfw](https://www.devonfw.com/) is a platform which provides solutions to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions. devonfw is 100% Open Source (Apache License version 2.0) since the beginning of 2018. -devon4ts_node is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. +devon4ts is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. -![License](https://img.shields.io/npm/l/@devon4ts_node/common) -![License](https://img.shields.io/npm/v/@devon4ts_node/common) -![License](https://img.shields.io/librariesio/release/npm/@devon4ts_node/common) -![License](https://img.shields.io/npm/dt/@devon4ts_node/common) +![License](https://img.shields.io/npm/l/@devon4ts/common) +![License](https://img.shields.io/npm/v/@devon4ts/common) +![License](https://img.shields.io/librariesio/release/npm/@devon4ts/common) +![License](https://img.shields.io/npm/dt/@devon4ts/common) -## devon4ts_node Common +## devon4ts Common -This package contains the devon4ts_node common libraries. Those libraries will help you build devon4ts_node applications. +This package contains the devon4ts common libraries. Those libraries will help you build devon4ts applications. ## Documentation -You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts_node/wiki). +You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts/wiki). ## Code of conduct @@ -28,10 +28,3 @@ Visit [contributing guide document](https://github.com/devonfw/.github/blob/mast ## Key Principles Visit [key principles document](https://github.com/devonfw/.github/blob/master/key-principles.asciidoc). - -## Samples - -- [Employee example](https://github.com/devonfw-sample/devon4ts_node-samples/tree/develop/employee): simple backend example for a employee management application. -- [Components example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/components-example): simple backend example which will show you the execution order of the devon4ts_node components. -- [GraphQL example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/graphql): simple GraphQL example with starter configuration. -- [My Thai Star](https://github.com/devonfw/my-thai-star/tree/develop/node): realistic example about the management of a restaurant. This example has also a frontend and it is compatible with other devonfw stacks. diff --git a/packages/common/package.json b/packages/common/package.json index 05069d49..75b46986 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,7 +1,7 @@ { - "name": "@devon4ts_node/common", + "name": "@devon4ts/common", "version": "5.0.1", - "description": "devon4ts_node common library.", + "description": "devon4ts common library.", "main": "dist/index.js", "scripts": { "build": "tsc -p tsconfig.json", @@ -15,7 +15,7 @@ }, "keywords": [ "nestjs", - "devon4ts_node", + "devon4ts", "devonfw" ], "author": { @@ -31,11 +31,11 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/devonfw/devon4ts_node.git" + "url": "git+https://github.com/devonfw/devon4ts.git" }, "bugs": { - "url": "https://github.com/devonfw/devon4ts_node/issues" + "url": "https://github.com/devonfw/devon4ts/issues" }, - "homepage": "https://github.com/devonfw/devon4ts_node", + "homepage": "https://github.com/devonfw/devon4ts", "gitHead": "1f351bcc0fbad70f9c25fa73a398a538ca0c8e55" -} \ No newline at end of file +} diff --git a/packages/config/README.md b/packages/config/README.md index b1c60ad6..df70bfa6 100644 --- a/packages/config/README.md +++ b/packages/config/README.md @@ -1,23 +1,23 @@ [DEPRECATED] This package is deprecated and will only receive updates to be compatible with the latest NestJS version. For new projects please use convict instead. -# devon4ts_node +# devon4ts [devonfw](https://www.devonfw.com/) is a platform which provides solutions to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions. devonfw is 100% Open Source (Apache License version 2.0) since the beginning of 2018. -devon4ts_node is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. +devon4ts is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. -![License](https://img.shields.io/npm/l/@devon4ts_node/config) -![License](https://img.shields.io/npm/v/@devon4ts_node/config) -![License](https://img.shields.io/librariesio/release/npm/@devon4ts_node/config) -![License](https://img.shields.io/npm/dt/@devon4ts_node/config) +![License](https://img.shields.io/npm/l/@devon4ts/config) +![License](https://img.shields.io/npm/v/@devon4ts/config) +![License](https://img.shields.io/librariesio/release/npm/@devon4ts/config) +![License](https://img.shields.io/npm/dt/@devon4ts/config) -## devon4ts_node config +## devon4ts config -This package contains the devon4ts_node config module. This module allows you to send emails in your devon4ts_node application in a easy way. +This package contains the devon4ts config module. This module allows you to send emails in your devon4ts application in a easy way. ## Documentation -You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts_node/wiki). +You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts/wiki). ## Code of conduct @@ -30,10 +30,3 @@ Visit [contributing guide document](https://github.com/devonfw/.github/blob/mast ## Key Principles Visit [key principles document](https://github.com/devonfw/.github/blob/master/key-principles.asciidoc). - -## Samples - -- [Employee example](https://github.com/devonfw-sample/devon4ts_node-samples/tree/develop/employee): simple backend example for a employee management application. -- [Components example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/components-example): simple backend example which will show you the execution order of the devon4ts_node components. -- [GraphQL example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/graphql): simple GraphQL example with starter configuration. -- [My Thai Star](https://github.com/devonfw/my-thai-star/tree/develop/node): realistic example about the management of a restaurant. This example has also a frontend and it is compatible with other devonfw stacks. diff --git a/packages/config/package.json b/packages/config/package.json index e64bcdf6..8811f216 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,7 +1,7 @@ { - "name": "@devon4ts_node/config", + "name": "@devon4ts/config", "version": "5.0.0", - "description": "devon4ts_node module for easy application configuration.", + "description": "devon4ts module for easy application configuration.", "main": "dist/index.js", "scripts": { "build": "rm -rf dist && tsc -p tsconfig.build.json", @@ -20,7 +20,7 @@ }, "keywords": [ "nestjs", - "devon4ts_node", + "devon4ts", "devonfw" ], "author": { @@ -39,12 +39,12 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/devonfw/devon4ts_node.git" + "url": "git+https://github.com/devonfw/devon4ts.git" }, "bugs": { - "url": "https://github.com/devonfw/devon4ts_node/issues" + "url": "https://github.com/devonfw/devon4ts/issues" }, - "homepage": "https://github.com/devonfw/devon4ts_node", + "homepage": "https://github.com/devonfw/devon4ts", "jest": { "moduleFileExtensions": [ "js", @@ -59,4 +59,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} \ No newline at end of file +} diff --git a/packages/logform/README.md b/packages/logform/README.md index ccc99883..368d0601 100644 --- a/packages/logform/README.md +++ b/packages/logform/README.md @@ -1,21 +1,21 @@ -# devon4ts_node +# devon4ts [devonfw](https://www.devonfw.com/) is a platform which provides solutions to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions. devonfw is 100% Open Source (Apache License version 2.0) since the beginning of 2018. -devon4ts_node is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. +devon4ts is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. -![License](https://img.shields.io/npm/l/@devon4ts_node/mailer) -![License](https://img.shields.io/npm/v/@devon4ts_node/mailer) -![License](https://img.shields.io/librariesio/release/npm/@devon4ts_node/mailer) -![License](https://img.shields.io/npm/dt/@devon4ts_node/mailer) +![License](https://img.shields.io/npm/l/@devon4ts/mailer) +![License](https://img.shields.io/npm/v/@devon4ts/mailer) +![License](https://img.shields.io/librariesio/release/npm/@devon4ts/mailer) +![License](https://img.shields.io/npm/dt/@devon4ts/mailer) -## devon4ts_node logform +## devon4ts logform -This package contains the devon4ts_node mailer module. This module allows you to send emails in your devon4ts_node application in a easy way. +This package contains the devon4ts mailer module. This module allows you to send emails in your devon4ts application in a easy way. ## Documentation -You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts_node/wiki). +You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts/wiki). ## Code of conduct @@ -28,10 +28,3 @@ Visit [contributing guide document](https://github.com/devonfw/.github/blob/mast ## Key Principles Visit [key principles document](https://github.com/devonfw/.github/blob/master/key-principles.asciidoc). - -## Samples - -- [Employee example](https://github.com/devonfw-sample/devon4ts_node-samples/tree/develop/employee): simple backend example for a employee management application. -- [Components example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/components-example): simple backend example which will show you the execution order of the devon4ts_node components. -- [GraphQL example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/graphql): simple GraphQL example with starter configuration. -- [My Thai Star](https://github.com/devonfw/my-thai-star/tree/develop/node): realistic example about the management of a restaurant. This example has also a frontend and it is compatible with other devonfw stacks. diff --git a/packages/logform/package.json b/packages/logform/package.json index 6da8346f..893dff56 100644 --- a/packages/logform/package.json +++ b/packages/logform/package.json @@ -1,7 +1,7 @@ { - "name": "@devon4ts_node/logform", + "name": "@devon4ts/logform", "version": "5.0.1", - "description": "devon4ts_node Winston Logger formatters.", + "description": "devon4ts Winston Logger formatters.", "main": "dist/index.js", "scripts": { "build": "rm -rf dist && tsc -p tsconfig.build.json", @@ -16,7 +16,7 @@ }, "keywords": [ "nestjs", - "devon4ts_node", + "devon4ts", "devonfw" ], "author": { @@ -34,12 +34,12 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/devonfw/devon4ts_node.git" + "url": "git+https://github.com/devonfw/devon4ts.git" }, "bugs": { - "url": "https://github.com/devonfw/devon4ts_node/issues" + "url": "https://github.com/devonfw/devon4ts/issues" }, - "homepage": "https://github.com/devonfw/devon4ts_node", + "homepage": "https://github.com/devonfw/devon4ts", "jest": { "moduleFileExtensions": [ "js", @@ -64,4 +64,4 @@ "@types/logfmt": "^1.2.2" }, "gitHead": "1f351bcc0fbad70f9c25fa73a398a538ca0c8e55" -} \ No newline at end of file +} diff --git a/packages/mailer/README.md b/packages/mailer/README.md index 6998def8..39445983 100644 --- a/packages/mailer/README.md +++ b/packages/mailer/README.md @@ -1,21 +1,21 @@ -# devon4ts_node +# devon4ts [devonfw](https://www.devonfw.com/) is a platform which provides solutions to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions. devonfw is 100% Open Source (Apache License version 2.0) since the beginning of 2018. -devon4ts_node is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in a standardized way based on established best-practices. +devon4ts is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in a standardized way based on established best-practices. -![License](https://img.shields.io/npm/l/@devon4ts_node/mailer) -![License](https://img.shields.io/npm/v/@devon4ts_node/mailer) -![License](https://img.shields.io/librariesio/release/npm/@devon4ts_node/mailer) -![License](https://img.shields.io/npm/dt/@devon4ts_node/mailer) +![License](https://img.shields.io/npm/l/@devon4ts/mailer) +![License](https://img.shields.io/npm/v/@devon4ts/mailer) +![License](https://img.shields.io/librariesio/release/npm/@devon4ts/mailer) +![License](https://img.shields.io/npm/dt/@devon4ts/mailer) -## devon4ts_node mailer +## devon4ts mailer -This package contains the devon4ts_node mailer module. This module allows you to send emails in your devon4ts_node application in a easy way. +This package contains the devon4ts mailer module. This module allows you to send emails in your devon4ts application in a easy way. ## Documentation -You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts_node/wiki). +You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts/wiki). ## Code of conduct @@ -28,10 +28,3 @@ Visit [contributing guide document](https://github.com/devonfw/.github/blob/mast ## Key Principles Visit [key principles document](https://github.com/devonfw/.github/blob/master/key-principles.asciidoc). - -## Samples - -- [Employee example](https://devon.s2-eu.capgemini.com/gitlab/devonfw/devon4ts-samples/-/tree/master/apps/nest-employee): simple backend example for a employee management application. -- [Components example](https://devon.s2-eu.capgemini.com/gitlab/devonfw/devon4ts-samples/-/tree/master/apps/nest-components): simple backend example which will show you the execution order of the devon4ts_node components. -- [GraphQL example](https://devon.s2-eu.capgemini.com/gitlab/devonfw/devon4ts-samples/-/tree/master/apps/nest-graphql): simple GraphQL example with starter configuration. -- [My Thai Star](https://devon.s2-eu.capgemini.com/gitlab/devonfw/my-thai-star/-/tree/develop/node): realistic example about the management of a restaurant. This example has also a frontend and it is compatible with other devonfw stacks. diff --git a/packages/mailer/package.json b/packages/mailer/package.json index ab0d1b99..4650455a 100644 --- a/packages/mailer/package.json +++ b/packages/mailer/package.json @@ -1,7 +1,7 @@ { - "name": "@devon4ts_node/mailer", + "name": "@devon4ts/mailer", "version": "5.0.1", - "description": "devon4ts_node module that allows you to send emails in an easy way.", + "description": "devon4ts module that allows you to send emails in an easy way.", "main": "./src/lib/index.js", "scripts": { "build": "rm -rf dist && tsc -p tsconfig.build.json", @@ -15,7 +15,7 @@ }, "keywords": [ "nestjs", - "devon4ts_node", + "devon4ts", "devonfw" ], "author": { @@ -43,12 +43,12 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/devonfw/devon4ts_node.git" + "url": "git+https://github.com/devonfw/devon4ts.git" }, "bugs": { - "url": "https://github.com/devonfw/devon4ts_node/issues" + "url": "https://github.com/devonfw/devon4ts/issues" }, - "homepage": "https://github.com/devonfw/devon4ts_node", + "homepage": "https://github.com/devonfw/devon4ts", "jest": { "moduleFileExtensions": [ "js", diff --git a/packages/schematics/.gitignore b/packages/schematics/.gitignore index 48039653..f2709b28 100644 --- a/packages/schematics/.gitignore +++ b/packages/schematics/.gitignore @@ -1,5 +1,5 @@ testing/ -schematics.devon4ts_node.json +schematics.devon4ts.json # Outputs src/**/*.js diff --git a/packages/schematics/README.md b/packages/schematics/README.md index 32176566..071d3ab5 100644 --- a/packages/schematics/README.md +++ b/packages/schematics/README.md @@ -1,21 +1,21 @@ -# devon4ts_node +# devon4ts [devonfw](https://www.devonfw.com/) is a platform which provides solutions to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions. devonfw is 100% Open Source (Apache License version 2.0) since the beginning of 2018. -devon4ts_node is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. +devon4ts is the NodeJS stack of devonfw. It allows you to build business applications (backends) using NodeJS technology in standardized way based on established best-practices. -![License](https://img.shields.io/npm/l/@devon4ts_node/schematics) -![License](https://img.shields.io/npm/v/@devon4ts_node/schematics) -![License](https://img.shields.io/librariesio/release/npm/@devon4ts_node/schematics) -![License](https://img.shields.io/npm/dt/@devon4ts_node/schematics) +![License](https://img.shields.io/npm/l/@devon4ts/schematics) +![License](https://img.shields.io/npm/v/@devon4ts/schematics) +![License](https://img.shields.io/librariesio/release/npm/@devon4ts/schematics) +![License](https://img.shields.io/npm/dt/@devon4ts/schematics) -## devon4ts_node Schematics +## devon4ts Schematics -This package contains the devon4ts_node schematics. Those schematics are responsible for generating code for devon4ts_node. +This package contains the devon4ts schematics. Those schematics are responsible for generating code for devon4ts. ## Documentation -You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts_node/wiki). +You can find all documentation in our [wiki](https://github.com/devonfw/devon4ts/wiki). ## Code of conduct @@ -28,10 +28,3 @@ Visit [contributing guide document](https://github.com/devonfw/.github/blob/mast ## Key Principles Visit [key principles document](https://github.com/devonfw/.github/blob/master/key-principles.asciidoc). - -## Samples - -- [Employee example](https://github.com/devonfw-sample/devon4ts_node-samples/tree/develop/employee): simple backend example for a employee management application. -- [Components example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/components-example): simple backend example which will show you the execution order of the devon4ts_node components. -- [GraphQL example](https://github.com/devonfw-sample/devon4ts_node/tree/develop/graphql): simple GraphQL example with starter configuration. -- [My Thai Star](https://github.com/devonfw/my-thai-star/tree/develop/node): realistic example about the management of a restaurant. This example has also a frontend and it is compatible with other devonfw stacks. diff --git a/packages/schematics/generators.json b/packages/schematics/generators.json index ff5fa9b4..a782d879 100644 --- a/packages/schematics/generators.json +++ b/packages/schematics/generators.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema", - "name": "@devon4ts_node/schematics", + "name": "@devon4ts/schematics", "version": "6.0.0", "generators": { "typeorm": { @@ -19,7 +19,7 @@ "schema": "./src/generators/convict/schema.json" }, "mailer": { - "description": "Add @devon4ts_node/mailer module to project.", + "description": "Add mailer module to project.", "factory": "./src/generators/mailer/generator", "schema": "./src/generators/mailer/schema.json" }, diff --git a/packages/schematics/package.json b/packages/schematics/package.json index 1d79760e..e359b5db 100644 --- a/packages/schematics/package.json +++ b/packages/schematics/package.json @@ -1,7 +1,7 @@ { - "name": "@devon4ts_node/schematics", + "name": "@devon4ts/schematics", "version": "5.0.1", - "description": "Schematics for devon4ts_node", + "description": "Schematics for devon4ts", "scripts": { "build": "tsc -p tsconfig.build.json", "format": "prettier --write \"src/**/*.ts\" \"!src/**/files/**/*\"", @@ -18,7 +18,7 @@ "keywords": [ "schematics", "nestjs", - "devon4ts_node" + "devon4ts" ], "author": "Dario Rodriguez Gonzalez ", "license": "Apache-2.0", diff --git a/packages/schematics/src/collection.json b/packages/schematics/src/collection.json index 5406e7de..4ae4ee28 100644 --- a/packages/schematics/src/collection.json +++ b/packages/schematics/src/collection.json @@ -16,7 +16,7 @@ "schema": "./generators/convict/schema.json" }, "mailer": { - "description": "Add @devon4ts_node/mailer module to project.", + "description": "Add mailer module to project.", "factory": "./generators/mailer/generator", "schema": "./generators/mailer/schema.json" }, diff --git a/packages/schematics/src/generators/application/files/src/app/shared/logger/winston.logger.ts.template b/packages/schematics/src/generators/application/files/src/app/shared/logger/winston.logger.ts.template index 2c85207f..082b3265 100644 --- a/packages/schematics/src/generators/application/files/src/app/shared/logger/winston.logger.ts.template +++ b/packages/schematics/src/generators/application/files/src/app/shared/logger/winston.logger.ts.template @@ -1,7 +1,7 @@ import { Inject, Injectable, LoggerService, Scope } from '@nestjs/common'; import { INQUIRER } from '@nestjs/core'; import * as winston from 'winston'; -import { separator, colorize, pid, oneLineStack } from '@devon4ts_node/logform'; +import { separator, colorize, pid, oneLineStack } from '@devon4ts/logform'; const BASE_LOGGER: winston.Logger = winston.createLogger({ format: winston.format.combine(winston.format.timestamp(), pid(), oneLineStack(false), colorize(true), separator()), diff --git a/packages/schematics/src/generators/mailer/generator.spec.ts b/packages/schematics/src/generators/mailer/generator.spec.ts index decb49b9..bcf4b2bc 100644 --- a/packages/schematics/src/generators/mailer/generator.spec.ts +++ b/packages/schematics/src/generators/mailer/generator.spec.ts @@ -22,7 +22,7 @@ describe('mailer generator', () => { it('should add dependencies to package.json', async () => { const fileContent = tree.read('package.json')?.toString('utf-8'); expect(fileContent).toMatch(/"dependencies": {(.|\n)*"handlebars\":/g); - expect(fileContent).toMatch(/"dependencies": {(.|\n)*"@devon4ts_node\/mailer\":/g); + expect(fileContent).toMatch(/"dependencies": {(.|\n)*"@devon4ts\/mailer\":/g); }); it('should add MailerModule to core.module', async () => { diff --git a/packages/schematics/src/generators/mailer/generator.ts b/packages/schematics/src/generators/mailer/generator.ts index 7de35cce..9ec5855d 100644 --- a/packages/schematics/src/generators/mailer/generator.ts +++ b/packages/schematics/src/generators/mailer/generator.ts @@ -11,7 +11,7 @@ export async function mailerGenerator(tree: Tree, options: MailerGeneratorSchema addDependenciesToPackageJson( tree, { - [packagesVersion['devon4ts_nodeMailer'].name]: packagesVersion['devon4ts_nodeMailer'].version, + [packagesVersion['devon4tsMailer'].name]: packagesVersion['devon4tsMailer'].version, [packagesVersion['handlebars'].name]: packagesVersion['handlebars'].version, }, {}, @@ -39,7 +39,7 @@ function addMailerToCoreModule(tree: Tree, existsConfig: boolean, projectRoot: s } coreContent - .addImports('MailerModule', '@devon4ts_node/mailer') + .addImports('MailerModule', '@devon4ts/mailer') .addImports('join', 'path') .addToModuleDecorator( 'CoreModule', diff --git a/packages/schematics/src/generators/packagesVersion.ts b/packages/schematics/src/generators/packagesVersion.ts index 96fd4895..cd330a00 100644 --- a/packages/schematics/src/generators/packagesVersion.ts +++ b/packages/schematics/src/generators/packagesVersion.ts @@ -5,10 +5,10 @@ export const packagesVersion: { [k: string]: { name: string; version: string } } cockroachdb: { name: 'pg', version: '^8.11.3' }, convict: { name: 'convict', version: '^6.2.4' }, express: { name: 'express', version: '^4.18.2' }, - devon4ts_nodeCommon: { name: '@devon4ts_node/common', version: '^5.0.1' }, - devon4ts_nodeLogform: { name: '@devon4ts_node/logform', version: '^5.0.1' }, - devon4ts_nodeMailer: { name: '@devon4ts_node/mailer', version: 'latest' }, - devon4ts_nodeSchematics: { name: '@devon4ts_node/schematics', version: '^5.0.1' }, + devon4tsCommon: { name: '@devon4ts/common', version: '^5.0.1' }, + devon4tsLogform: { name: '@devon4ts/logform', version: '^5.0.1' }, + devon4tsMailer: { name: '@devon4ts/mailer', version: 'latest' }, + devon4tsSchematics: { name: '@devon4ts/schematics', version: '^5.0.1' }, eslintPluginPrettier: { name: 'eslint-plugin-prettier', version: '^5.1.3' }, handlebars: { name: 'handlebars', version: '^4.7.8' }, helmet: { name: 'helmet', version: '^7.1.0' },