Skip to content

Commit

Permalink
Master brunch merge (#148)
Browse files Browse the repository at this point in the history
  • Loading branch information
Enase authored Jan 10, 2024
2 parents 41a5b76 + 5393e61 commit fcf445a
Show file tree
Hide file tree
Showing 10 changed files with 960 additions and 819 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ updates:
prefix: 'chore'
include: 'scope'
open-pull-requests-limit: 10
ignore:
- dependency-name: "@types/node"
- dependency-name: "typescript"
- dependency-name: "chalk"

# node packages
- package-ecosystem: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
enable-pre-post-scripts=true
publish-branch=typescript-cjs
publish-branch=cjs-master
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ before_install:
branches:
only:
- master
- cjs-master
install:
- pnpm install
script:
Expand Down
34 changes: 33 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,44 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Unreleased list of features goes here...
-->

## [5.0.2] - 2023-09-26
## [6.1.0] - 2024-01-10

### Breaking Changes
- **Modified Autodeploy Behavior**: The behavior of auto-deploy has been updated.
Starting now, when the `disableAutoDeploy` configuration value is set to `false`,
the plugin will automatically remove templates during the `before:remove:remove` serverless internal event.
This change enhances stack management and helps prevent unintended template retention
when executing the `sls remove` command to remove the AWS CloudFormation stack.
[#147](https://github.com/Enase/serverless-ses-template/pull/147)

### Changed
- Dependencies updated

## [6.0.0] - 2023-09-26

### Breaking Changes
- **Migration to TypeScript**: The project has been refactored using TypeScript. [Learn about our motivation and the detailed changes](https://github.com/Enase/serverless-ses-template/discussions/61).
- **Pure ESM Package**: Plugin transitioned to a pure ESM module. If you're unfamiliar with this, please [consult this guide](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c) to understand the implications.
- **Serverless Version Requirement**: Ensure you are using `serverless` version [v3.2.0](https://github.com/serverless/serverless/releases/tag/v3.2.0) or above, as this is now the minimum supported version.

## [5.1.0] - 2024-01-10

### Breaking Changes
- **Modified Autodeploy Behavior**: The behavior of auto-deploy has been updated.
Starting now, when the `disableAutoDeploy` configuration value is set to `false`,
the plugin will automatically remove templates during the `before:remove:remove` serverless internal event.
This change enhances stack management and helps prevent unintended template retention
when executing the `sls remove` command to remove the AWS CloudFormation stack.
[#147](https://github.com/Enase/serverless-ses-template/pull/147)

### Changed
- Dependencies updated

## [5.0.2] - 2023-09-26

### Breaking Changes
- **Migration to TypeScript**: The project has been refactored using TypeScript. [Learn about our motivation and the detailed changes](https://github.com/Enase/serverless-ses-template/discussions/61).
- **Serverless Version Requirement**: Ensure you are using `serverless` version [v3.2.0](https://github.com/serverless/serverless/releases/tag/v3.2.0) or above, as this is now the minimum supported version.

## [4.0.7] - 2023-06-27

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![npm][ico-npm-downloads]][link-npm]
[![Build Status][ico-build]][link-build]
[![slack][ico-slack]][link-slack]

[![Made in Ukraine](https://img.shields.io/badge/made_in-Ukraine-ffd700.svg?labelColor=0057b7)](https://stand-with-ukraine.pp.ua)

[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine/)

Expand All @@ -13,15 +13,15 @@ Template sync plugin for Amazon Simple Email Service
A serverless plugin that allows automatically creating, updating and removing
AWS SES Templates using a configuration file and keeps your AWS SES Templates
synced with your configuration file.

> 🚨 **Important Notice**: Starting from 6.x version, plugin has transitioned to **[pure ESM](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c)** and requires serverless [v3.2.0](https://github.com/serverless/serverless/releases/tag/v3.2.0) or newer.
---
> 🚨 **Important Notice**: Starting from [6.x](https://github.com/Enase/serverless-ses-template) version, plugin has transitioned to **[pure ESM](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c)** and requires serverless [v3.2.0](https://github.com/serverless/serverless/releases/tag/v3.2.0) or newer.
>
> If you need for **CJS package** use [5.x](https://github.com/Enase/serverless-ses-template/tree/5.0.2) plugin series
> If you need for **CJS package** use [5.x](https://github.com/Enase/serverless-ses-template/tree/5.1.0) plugin series
>
> If you need compatibility with `serverless<=3.2.0`, please use tag [v4.0.7](https://github.com/Enase/serverless-ses-template/tree/4.0.7).
> If you need compatibility with `serverless<=3.0.0`, please use tag [v4.0.7](https://github.com/Enase/serverless-ses-template/tree/4.0.7).
>
> Read [motivation here](https://github.com/Enase/serverless-ses-template/discussions/61)
---
**REQUIRES** nodejs 18+

---
Expand Down Expand Up @@ -56,7 +56,7 @@ custom:
addStage: true # Specifies whether to add stage to template name (default false)
configFile: './custom-config-file/path.js' # Config file path (default './ses-email-templates/index.js')
deployHook: 'after:deploy:deploy' # Specifies serverless lifecycle event plugin use to deploy templates (default 'before:deploy:deploy')
disableAutoDeploy: true # Specifies whether to sync templates while sls deploy (default false)
disableAutoDeploy: true # Specifies whether to sync templates while sls deploy and remove (default false)
region: 'us-west-2' # Specifies AWS region for SES templates (not required)
removeMissed: false # Set this flag in order to remove templates those are not present in your configuration file. (not required, default false)
```
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"aws-sdk": "^2.1464.0"
},
"devDependencies": {
"@haftahave/serverless-ses-template": "5.0.2"
"@haftahave/serverless-ses-template": "5.1.0"
},
"engines": {
"node": ">= 12.18.4",
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"access": "public",
"registry": "https://registry.npmjs.org/"
},
"version": "5.0.2",
"version": "5.1.0",
"description": "Serverless template sync plugin for Amazon Simple Email Service",
"keywords": [
"serverless",
Expand Down Expand Up @@ -57,28 +57,28 @@
"cli-table": "^0.3.11"
},
"devDependencies": {
"@babel/core": "^7.23.0",
"@babel/preset-env": "^7.22.20",
"@babel/preset-typescript": "^7.23.0",
"@babel/core": "^7.23.7",
"@babel/preset-env": "^7.23.8",
"@babel/preset-typescript": "^7.23.3",
"@tsconfig/node18": "^18.2.2",
"@types/cli-table": "^0.3.2",
"@types/jest": "^29.5.5",
"@types/node": "^18.18.0",
"@types/serverless": "^3.12.16",
"@typescript-eslint/eslint-plugin": "^6.7.3",
"@typescript-eslint/parser": "^6.7.3",
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-jest": "^27.4.0",
"eslint-plugin-prettier": "^5.0.0",
"@types/cli-table": "^0.3.4",
"@types/jest": "^29.5.11",
"@types/node": "^18.19.6",
"@types/serverless": "^3.12.20",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jest": "^27.6.2",
"eslint-plugin-prettier": "^5.1.3",
"jest": "^29.7.0",
"jest-circus": "^29.7.0",
"nock": "^13.3.3",
"nock": "^13.4.0",
"npm-run-all": "^4.1.5",
"serverless": "^3.35.2",
"serverless": "^3.38.0",
"shx": "^0.3.4",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "5.1.6"
},
"files": [
Expand Down
Loading

0 comments on commit fcf445a

Please sign in to comment.