From e155454013aa32e31db6afe5d6cb476c21d38aba Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 12:27:34 +0000 Subject: [PATCH 01/10] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20vers?= =?UTF-8?q?ion=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4b59b6..a099373 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. Dates are d #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.1.2) - update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15) +- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663) +- 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39) +- 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c) - 🧾New changelog file version [CI SKIP] [skip ci] [`e713ef5`](https://git.odit.services/lfk/mailer/commit/e713ef54ef39d4759832ada073cea825b4ef26dc) #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2) From 22470d6160b450515966e7e38c37c45085f8ceb2 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 13:31:20 +0100 Subject: [PATCH 02/10] Version pinning --- package.json | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 9a98b15..3830f41 100644 --- a/package.json +++ b/package.json @@ -44,37 +44,37 @@ ], "license": "CC-BY-NC-SA-4.0", "dependencies": { - "@odit/class-validator-jsonschema": "^2.1.1", + "@odit/class-validator-jsonschema": "2.1.1", "class-transformer": "0.3.1", - "class-validator": "^0.13.1", - "consola": "^2.15.3", - "cors": "^2.8.5", - "dotenv": "^8.2.0", - "express": "^4.17.1", - "handlebars": "^4.7.6", - "i18next": "^19.8.7", - "i18next-fs-backend": "^1.0.8", - "nodemailer": "^6.5.0", - "reflect-metadata": "^0.1.13", + "class-validator": "0.13.1", + "consola": "2.15.3", + "cors": "2.8.5", + "dotenv": "8.2.0", + "express": "4.17.1", + "handlebars": "4.7.6", + "i18next": "19.8.7", + "i18next-fs-backend": "1.0.8", + "nodemailer": "6.5.0", + "reflect-metadata": "0.1.13", "routing-controllers": "0.9.0-alpha.6", "routing-controllers-openapi": "2.2.0" }, "devDependencies": { - "@odit/license-exporter": "^0.0.10", - "@types/express": "^4.17.11", - "@types/jest": "^26.0.20", - "@types/node": "^14.14.22", - "@types/nodemailer": "^6.4.0", - "axios": "^0.21.1", - "cp-cli": "^2.0.0", - "jest": "^26.6.3", - "nodemon": "^2.0.7", - "release-it": "^14.2.2", - "rimraf": "^3.0.2", - "start-server-and-test": "^1.12.0", - "ts-jest": "^26.5.2", - "ts-node": "^9.1.1", - "typescript": "^4.1.3" + "@odit/license-exporter": "0.0.10", + "@types/express": "4.17.11", + "@types/jest": "26.0.20", + "@types/node": "14.14.22", + "@types/nodemailer": "6.4.0", + "axios": "0.21.1", + "cp-cli": "2.0.0", + "jest": "26.6.3", + "nodemon": "2.0.7", + "release-it": "14.2.2", + "rimraf": "3.0.2", + "start-server-and-test": "1.12.0", + "ts-jest": "26.5.2", + "ts-node": "9.1.1", + "typescript": "4.1.3" }, "release-it": { "git": { @@ -89,4 +89,4 @@ "publish": false } } -} +} \ No newline at end of file From acb013e8ae86f868aced40dbc2a68f8165627145 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 13:31:31 +0100 Subject: [PATCH 03/10] Shut up pnpm warnings --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..fa4e095 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +strict-peer-dependencies=false \ No newline at end of file From af173dcec822f12d8233b717304ad82b7fac14db Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 13:32:55 +0100 Subject: [PATCH 04/10] Bumped docker node --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 41b7e99..70b6eb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Typescript Build -FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12 +FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16 WORKDIR /app COPY package.json ./ RUN npm i -g pnpm @@ -8,7 +8,7 @@ COPY tsconfig.json ./ COPY src ./src RUN pnpm run build # final image -FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12 +FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16 COPY package.json ./ RUN npm i -g pnpm RUN pnpm i --prod From f422f989c7d5c2fead70e37fc314b734034916f7 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 13:35:51 +0100 Subject: [PATCH 05/10] Now building w/ kaniko --- .drone.yml | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7efbdd9..e982f17 100644 --- a/.drone.yml +++ b/.drone.yml @@ -54,18 +54,22 @@ steps: - git clone $DRONE_REMOTE_URL . - git checkout dev - name: build dev - image: plugins/docker - depends_on: [clone] + image: registry.odit.services/library/drone-kaniko settings: username: from_secret: docker_username password: from_secret: docker_password - repo: registry.odit.services/lfk/mailer + build_args: + - NPM_REGISTRY_DOMAIN: + from_secret: npmjs_domain + - NPM_REGISTRY_TOKEN: + from_secret: npmjs_token + repo: lfk/mailer tags: - dev + cache: true registry: registry.odit.services - mtu: 1000 - name: run changelog export depends_on: ["clone"] image: node:latest @@ -100,7 +104,6 @@ steps: skip_verify: true ssh_key: from_secret: git_ssh - trigger: branch: - dev @@ -123,18 +126,22 @@ steps: - git merge main - git checkout main - name: build latest - depends_on: ["clone"] - image: plugins/docker + image: registry.odit.services/library/drone-kaniko settings: username: from_secret: docker_username password: from_secret: docker_password - repo: registry.odit.services/lfk/mailer + build_args: + - NPM_REGISTRY_DOMAIN: + from_secret: npmjs_domain + - NPM_REGISTRY_TOKEN: + from_secret: npmjs_token + repo: lfk/mailer tags: - latest + cache: true registry: registry.odit.services - mtu: 1000 - name: push merge to repo depends_on: ["clone"] image: appleboy/drone-git-push @@ -144,7 +151,6 @@ steps: remote: git@git.odit.services:lfk/mailer.git ssh_key: from_secret: git_ssh - trigger: branch: - main @@ -158,18 +164,22 @@ name: build:tags steps: - name: build $DRONE_TAG - image: plugins/docker - depends_on: [clone] + image: registry.odit.services/library/drone-kaniko settings: username: from_secret: docker_username password: from_secret: docker_password - repo: registry.odit.services/lfk/mailer + build_args: + - NPM_REGISTRY_DOMAIN: + from_secret: npmjs_domain + - NPM_REGISTRY_TOKEN: + from_secret: npmjs_token + repo: lfk/mailer tags: - - '${DRONE_TAG}' + - "${DRONE_TAG}" + cache: true registry: registry.odit.services - mtu: 1000 trigger: event: - - tag \ No newline at end of file + - tag From c48a2ed01e65dc20c562d80099ca7448a8725446 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 13:36:23 +0100 Subject: [PATCH 06/10] Fresh licenses 4 yall --- licenses.md | 67 ++++++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/licenses.md b/licenses.md index 65efca2..30fc94b 100644 --- a/licenses.md +++ b/licenses.md @@ -244,7 +244,7 @@ SOFTWARE. # i18next-fs-backend **Author**: undefined **Repo**: git@github.com:i18next/i18next-fs-backend.git -**License**: MIT +**License**: undefined **Description**: i18next-fs-backend is a backend layer for i18next using in Node.js and for Deno to load translations from the filesystem. ## License Text @@ -492,27 +492,27 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **License**: MIT **Description**: TypeScript definitions for Nodemailer ## License Text - MIT License - - Copyright (c) Microsoft Corporation. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE + MIT License + + Copyright (c) Microsoft Corporation. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE # axios @@ -604,7 +604,7 @@ SOFTWARE. **Author**: [object Object] **Repo**: https://github.com/remy/nodemon.git **License**: MIT -**Description**: Simple monitor script for use during development of a Node.js app. +**Description**: Simple monitor script for use during development of a node.js app. ## License Text MIT License @@ -687,27 +687,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **License**: MIT **Description**: Starts server, waits for URL, then runs test command; when the tests end, shuts down server ## License Text -MIT License - -Copyright (c) 2022 bahmutov - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. # ts-jest From 0692b72955974c2fdee6441d4e7838d41dde8ed6 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 13:37:48 +0100 Subject: [PATCH 07/10] Bumped used ci node images --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index e982f17..9bdffb0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ get: --- kind: pipeline type: kubernetes -name: tests:node_latest +name: tests:node clone: disable: true steps: @@ -32,7 +32,7 @@ steps: - git clone $DRONE_REMOTE_URL . - git checkout $DRONE_SOURCE_BRANCH - name: run tests - image: node:latest + image: registry.odit.services/hub/library/node:19.0.1-alpine3.16 commands: - yarn - yarn test:ci @@ -72,7 +72,7 @@ steps: registry: registry.odit.services - name: run changelog export depends_on: ["clone"] - image: node:latest + image: registry.odit.services/hub/library/node:19.0.1-alpine3.16 commands: - npx auto-changelog --commit-limit false -p -u --hide-credit - name: push new changelog to repo @@ -88,7 +88,7 @@ steps: from_secret: git_ssh - name: run full license export depends_on: ["clone"] - image: node:14.15.1-alpine3.12 + image: registry.odit.services/hub/library/node:19.0.1-alpine3.16 commands: - yarn - yarn licenses:export From 84e3778b8962834b57ee92ba01a0b02505bbc7e7 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 1 Feb 2023 17:53:01 +0100 Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=9A=80Bumped=20version=20to=20v0.2.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3830f41..5f6c4b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-mailer", - "version": "0.1.2", + "version": "0.2.0", "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)", "main": "src/app.ts", "scripts": { @@ -89,4 +89,4 @@ "publish": false } } -} \ No newline at end of file +} From 68bd293acb474fe8f201423ffd442d0ee186a482 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 2 Feb 2023 15:57:02 +0100 Subject: [PATCH 09/10] Moved Release management to releaseit --- .drone.yml | 43 ------------ .gitignore | 1 + package.json | 191 ++++++++++++++++++++++++++------------------------- 3 files changed, 100 insertions(+), 135 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9bdffb0..9d71978 100644 --- a/.drone.yml +++ b/.drone.yml @@ -70,40 +70,6 @@ steps: - dev cache: true registry: registry.odit.services - - name: run changelog export - depends_on: ["clone"] - image: registry.odit.services/hub/library/node:19.0.1-alpine3.16 - commands: - - npx auto-changelog --commit-limit false -p -u --hide-credit - - name: push new changelog to repo - depends_on: ["run changelog export"] - image: appleboy/drone-git-push - settings: - branch: dev - commit: true - commit_message: 🧾New changelog file version [CI SKIP] [skip ci] - author_email: bot@odit.services - remote: git@git.odit.services:lfk/mailer.git - ssh_key: - from_secret: git_ssh - - name: run full license export - depends_on: ["clone"] - image: registry.odit.services/hub/library/node:19.0.1-alpine3.16 - commands: - - yarn - - yarn licenses:export - - name: push new licenses file to repo - depends_on: ["run full license export"] - image: appleboy/drone-git-push - settings: - branch: dev - commit: true - commit_message: 📖New license file version [CI SKIP] [skip ci] - author_email: bot@odit.services - remote: git@git.odit.services:lfk/mailer.git - skip_verify: true - ssh_key: - from_secret: git_ssh trigger: branch: - dev @@ -142,15 +108,6 @@ steps: - latest cache: true registry: registry.odit.services - - name: push merge to repo - depends_on: ["clone"] - image: appleboy/drone-git-push - settings: - branch: dev - commit: false - remote: git@git.odit.services:lfk/mailer.git - ssh_key: - from_secret: git_ssh trigger: branch: - main diff --git a/.gitignore b/.gitignore index ce593e3..f860af9 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,4 @@ build lib /oss-attribution *.tmp +pnpm-lock.yaml diff --git a/package.json b/package.json index 5f6c4b6..bc2ed26 100644 --- a/package.json +++ b/package.json @@ -1,92 +1,99 @@ -{ - "name": "@odit/lfk-mailer", - "version": "0.2.0", - "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)", - "main": "src/app.ts", - "scripts": { - "dev": "nodemon src/app.ts", - "build": "rimraf ./dist && tsc && cp-cli ./src/templates ./dist/templates && cp-cli ./src/locales ./dist/locales", - "licenses:export": "license-exporter --markdown", - "release": "release-it --only-version", - "translations:sort": "node ./scripts/sort_translations.js", - "test": "jest", - "test:watch": "jest --watchAll", - "test:generate_env": "ts-node ./scripts/create_testenv.ts", - "test:ci": "npm run test:generate_env && npm run test:ci:run", - "test:ci:run": "start-server-and-test dev http://localhost:4010/docs/openapi.json test" - }, - "repository": { - "type": "git", - "url": "git@git.odit.services:lfk/mailer.git" - }, - "keywords": [ - "odit", - "lfk", - "mail", - "node" - ], - "author": { - "name": "ODIT.Services", - "email": "info@odit.services", - "url": "https://odit.services" - }, - "contributors": [ - { - "name": "Philipp Dormann", - "email": "philipp@philippdormann.de", - "url": "https://philippdormann.de" - }, - { - "name": "Nicolai Ort", - "email": "info@nicolai-ort.com", - "url": "https://nicolai-ort.com" - } - ], - "license": "CC-BY-NC-SA-4.0", - "dependencies": { - "@odit/class-validator-jsonschema": "2.1.1", - "class-transformer": "0.3.1", - "class-validator": "0.13.1", - "consola": "2.15.3", - "cors": "2.8.5", - "dotenv": "8.2.0", - "express": "4.17.1", - "handlebars": "4.7.6", - "i18next": "19.8.7", - "i18next-fs-backend": "1.0.8", - "nodemailer": "6.5.0", - "reflect-metadata": "0.1.13", - "routing-controllers": "0.9.0-alpha.6", - "routing-controllers-openapi": "2.2.0" - }, - "devDependencies": { - "@odit/license-exporter": "0.0.10", - "@types/express": "4.17.11", - "@types/jest": "26.0.20", - "@types/node": "14.14.22", - "@types/nodemailer": "6.4.0", - "axios": "0.21.1", - "cp-cli": "2.0.0", - "jest": "26.6.3", - "nodemon": "2.0.7", - "release-it": "14.2.2", - "rimraf": "3.0.2", - "start-server-and-test": "1.12.0", - "ts-jest": "26.5.2", - "ts-node": "9.1.1", - "typescript": "4.1.3" - }, - "release-it": { - "git": { - "commit": true, - "requireCleanWorkingDir": false, - "commitMessage": "🚀Bumped version to v${version}", - "requireBranch": "dev", - "push": false, - "tag": false - }, - "npm": { - "publish": false - } - } -} +{ + "name": "@odit/lfk-mailer", + "version": "0.2.0", + "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)", + "main": "src/app.ts", + "scripts": { + "dev": "nodemon src/app.ts", + "build": "rimraf ./dist && tsc && cp-cli ./src/templates ./dist/templates && cp-cli ./src/locales ./dist/locales", + "licenses:export": "license-exporter --markdown", + "changelog:export": "auto-changelog --commit-limit false -p -u --hide-credit", + "release": "release-it --only-version", + "translations:sort": "node ./scripts/sort_translations.js", + "test": "jest", + "test:watch": "jest --watchAll", + "test:generate_env": "ts-node ./scripts/create_testenv.ts", + "test:ci": "npm run test:generate_env && npm run test:ci:run", + "test:ci:run": "start-server-and-test dev http://localhost:4010/docs/openapi.json test" + }, + "repository": { + "type": "git", + "url": "git@git.odit.services:lfk/mailer.git" + }, + "keywords": [ + "odit", + "lfk", + "mail", + "node" + ], + "author": { + "name": "ODIT.Services", + "email": "info@odit.services", + "url": "https://odit.services" + }, + "contributors": [ + { + "name": "Philipp Dormann", + "email": "philipp@philippdormann.de", + "url": "https://philippdormann.de" + }, + { + "name": "Nicolai Ort", + "email": "info@nicolai-ort.com", + "url": "https://nicolai-ort.com" + } + ], + "license": "CC-BY-NC-SA-4.0", + "dependencies": { + "@odit/class-validator-jsonschema": "2.1.1", + "class-transformer": "0.3.1", + "class-validator": "0.13.1", + "consola": "2.15.3", + "cors": "2.8.5", + "dotenv": "8.2.0", + "express": "4.17.1", + "handlebars": "4.7.6", + "i18next": "19.8.7", + "i18next-fs-backend": "1.0.8", + "nodemailer": "6.5.0", + "reflect-metadata": "0.1.13", + "routing-controllers": "0.9.0-alpha.6", + "routing-controllers-openapi": "2.2.0" + }, + "devDependencies": { + "@odit/license-exporter": "0.0.10", + "@types/express": "4.17.11", + "@types/jest": "26.0.20", + "@types/node": "14.14.22", + "@types/nodemailer": "6.4.0", + "auto-changelog": "^2.4.0", + "axios": "0.21.1", + "cp-cli": "2.0.0", + "jest": "26.6.3", + "nodemon": "2.0.7", + "release-it": "14.2.2", + "rimraf": "3.0.2", + "start-server-and-test": "1.12.0", + "ts-jest": "26.5.2", + "ts-node": "9.1.1", + "typescript": "4.1.3" + }, + "release-it": { + "git": { + "commit": true, + "requireCleanWorkingDir": false, + "commitMessage": "🚀Bumped version to v${version}", + "requireBranch": "dev", + "push": true, + "tag": true, + "tagName": "v${version}", + "tagAnnotation": "v${version}" + }, + "npm": { + "publish": false + }, + "hooks": { + "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md" + } + } +} \ No newline at end of file From da4f497e887e788adf6d39f71d61488157c8381a Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 2 Feb 2023 15:57:44 +0100 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=9A=80Bumped=20version=20to=20v0.2.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 14 ++++++++++++-- licenses.md | 29 +++++++++++++++++++++++++++++ package.json | 4 ++-- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a099373..ad5a5f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,22 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. -#### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.1.2) +#### [v0.2.1](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.2.1) - update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15) -- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663) +- Moved Release management to releaseit [`68bd293`](https://git.odit.services/lfk/mailer/commit/68bd293acb474fe8f201423ffd442d0ee186a482) +- 🚀Bumped version to v0.2.0 [`84e3778`](https://git.odit.services/lfk/mailer/commit/84e3778b8962834b57ee92ba01a0b02505bbc7e7) +- Merge pull request 'feature/kaniko' (#18) from feature/kaniko into dev [`4ca5f9d`](https://git.odit.services/lfk/mailer/commit/4ca5f9d38dc3300d0bcbf8448283b53b484a827d) +- Fresh licenses 4 yall [`c48a2ed`](https://git.odit.services/lfk/mailer/commit/c48a2ed01e65dc20c562d80099ca7448a8725446) +- Version pinning [`22470d6`](https://git.odit.services/lfk/mailer/commit/22470d6160b450515966e7e38c37c45085f8ceb2) +- Now building w/ kaniko [`f422f98`](https://git.odit.services/lfk/mailer/commit/f422f989c7d5c2fead70e37fc314b734034916f7) - 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39) +- Bumped used ci node images [`0692b72`](https://git.odit.services/lfk/mailer/commit/0692b72955974c2fdee6441d4e7838d41dde8ed6) - 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c) +- Bumped docker node [`af173dc`](https://git.odit.services/lfk/mailer/commit/af173dcec822f12d8233b717304ad82b7fac14db) +- 🧾New changelog file version [CI SKIP] [skip ci] [`e155454`](https://git.odit.services/lfk/mailer/commit/e155454013aa32e31db6afe5d6cb476c21d38aba) +- Shut up pnpm warnings [`acb013e`](https://git.odit.services/lfk/mailer/commit/acb013e8ae86f868aced40dbc2a68f8165627145) +- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663) - 🧾New changelog file version [CI SKIP] [skip ci] [`e713ef5`](https://git.odit.services/lfk/mailer/commit/e713ef54ef39d4759832ada073cea825b4ef26dc) #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2) diff --git a/licenses.md b/licenses.md index 30fc94b..98de2f4 100644 --- a/licenses.md +++ b/licenses.md @@ -515,6 +515,35 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE +# auto-changelog +**Author**: Pete Cook (https://github.com/cookpete) +**Repo**: https://github.com/CookPete/auto-changelog.git +**License**: MIT +**Description**: Command line tool for generating a changelog from git tags and commit history +## License Text +The MIT License + +Copyright (c) 2017 Pete Cook https://cookpete.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + # axios **Author**: Matt Zabriskie **Repo**: https://github.com/axios/axios.git diff --git a/package.json b/package.json index bc2ed26..b12c087 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-mailer", - "version": "0.2.0", + "version": "0.2.1", "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)", "main": "src/app.ts", "scripts": { @@ -96,4 +96,4 @@ "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md" } } -} \ No newline at end of file +}